forked from moqui/moqui-runtime
-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conflict #13
Merged
Merged
Conflict #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add sessionId field to list screen for debugging
Changed header color to make it more obviously not production
Added Page Size to Log Viewer
…e into effect in non-mobile layouts.
…on-include when included section is a section-iterate with paginate=true; in qvt js don't show pagination widget if there is only one result
Updated rule for drawer background to only come into effect in non-mobile layouts.
…height, useful for certain types of screens with particular or bottom instead of top focused layouts
…hidden parameters
… and last row forms
… has dynamic-options plus list-options for pre-loaded values
…rtial tests of existing screens, minor version updates are hopefully backward compatible but worth keeping an eye out for issues
…dle-minify plugins
* Add currency-hide-symbol attribute as a comlement to currency-unit-field, displaying the value without the currency symbol * Update AUTHORS file
…ecurity notice for ElFinder for versions 2.1.61 and earlier, but it appears to only for the server-side PHP code which is not used in moqui; also updated jquery to 3.7.1 while at it
Fix submit on select drop down where there is one result
* In Login.ftl, added SSO tab and forms. This will only appear if SSO is configured. * In webroot-layout.css, increased the width of the forms from 340 to 380 so SSO tab doesn't overflow to new line.
* In Qapps mode, add a expansion button to the ContainerBox * sign the AUTHORS file
…o they are passed through
…rows if row selection is used in a form-list; in popup card for row selection add spacing around m-container-dialog to match spacing used by default for a form-single with field-row-big so that dialog and direct form submit buttons line up
…r label and link elements so that contents are not interpreted to avoid template injection from user-entered data
… link macros, in qvt add span v-pre around all q-tooltip text
… the child node has a condition attribute and that attribute evaluates to false
…tton visual indicator (moqui#225) * For qvt mode add m-form field change tracking support, some initial use in text-area, much more needed before done * In WebrootVue.qvt.js m-text-line pass through dense, outlined, and bg-color * In qvt default screen macros add submit button highlighting (disable outlined mode), add placeholders for other field types that still need to be finished and tested * More progress on form field change indicators: add support to m-form-link for find forms and such, add field change visual effects for drop-down, checkbox, radio, text-find; still more to do but now mostly for find forms which work but don't have visual indicators for all field types * In qvt render mode improve form field change detection to handle nulls and empty strings and arrays, also add support for date-find field type * In qvt render mode form change detection show visual indicator for remaining field types, improve empty/null compare; change detect and show visual indicator now initially complete
…m-list find options parameter values, thanks to Taher for reporting this on the forum
…boxes like in gmail to select a range of items, a bit of user tedium reduction
Increase size of checkboxes
Allow include of screen theme resource script footer
dixitdeepak
added a commit
that referenced
this pull request
May 9, 2024
* In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In qvt and vuet screen macros add span v-pre around one more place in link macros, in qvt add span v-pre around all q-tooltip text * More vue template injection, add to button text in linkFormForm for vuet, qvt * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * Conflict (#13) * Add sessionId field to list screen for debugging * Changed header color to make it more obviously not production * Added Page Size to Log Viewer * In WebrootVue.qvt.css, updated rule for drawer background to only come into effect in non-mobile layouts. * In DefaultScreenMacros for vuet and qvt add paginate support to section-include when included section is a section-iterate with paginate=true; in qvt js don't show pagination widget if there is only one result * In WebrootVue.qvt.js add qLayoutMinHeight method to calculate a full height, useful for certain types of screens with particular or bottom instead of top focused layouts * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In vuet and qvt widgetTextValue macro handle case with drop-down that has dynamic-options plus list-options for pre-loaded values * Update vue to 2.7.14, quasar to 1.22.10; all seems to work well in partial tests of existing screens, minor version updates are hopefully backward compatible but worth keeping an eye out for issues * In qvt default screen macros add support for text-area.@autogrow attribute * Small updates to webroot build.gradle: update gradle-versions and gradle-minify plugins * Currency (moqui#217) * Add currency-hide-symbol attribute as a comlement to currency-unit-field, displaying the value without the currency symbol * Update AUTHORS file * Update ElFinder client to 2.1.62 and jqueryui to 1.13.2, there is a security notice for ElFinder for versions 2.1.61 and earlier, but it appears to only for the server-side PHP code which is not used in moqui; also updated jquery to 3.7.1 while at it * Fix submit on select drop down where there is one result (moqui#219) * Fix submit on select drop down where there is one result * Changes required for new Moqui SSO component (moqui#222) * In Login.ftl, added SSO tab and forms. This will only appear if SSO is configured. * In webroot-layout.css, increased the width of the forms from 340 to 380 so SSO tab doesn't overflow to new line. * In Qapps mode, add a expansion button to the ContainerBox (moqui#216) * In Qapps mode, add a expansion button to the ContainerBox * sign the AUTHORS file * Enable accordion in form field-groups using qvt rendering (moqui#221) * In qvt render mode fix m-form-column-config find parameter handling so they are passed through * In qvt render mode FTL macros add empty column for first/second/last rows if row selection is used in a form-list; in popup card for row selection add spacing around m-container-dialog to match spacing used by default for a form-single with field-row-big so that dialog and direct form submit buttons line up * For moqui-framework issue #623 add v-pre to vue template generated for label and link elements so that contents are not interpreted to avoid template injection from user-entered data * In qvt and vuet screen macros add span v-pre around one more place in link macros, in qvt add span v-pre around all q-tooltip text * More vue template injection, add to button text in linkFormForm for vuet, qvt * In qvt render mode change button-menu macro to not render a q-item if the child node has a condition attribute and that attribute evaluates to false * Form field change detection and in-field visual indicators, submit button visual indicator (moqui#225) * For qvt mode add m-form field change tracking support, some initial use in text-area, much more needed before done * In WebrootVue.qvt.js m-text-line pass through dense, outlined, and bg-color * In qvt default screen macros add submit button highlighting (disable outlined mode), add placeholders for other field types that still need to be finished and tested * More progress on form field change indicators: add support to m-form-link for find forms and such, add field change visual effects for drop-down, checkbox, radio, text-find; still more to do but now mostly for find forms which work but don't have visual indicators for all field types * In qvt render mode improve form field change detection to handle nulls and empty strings and arrays, also add support for date-find field type * In qvt render mode form change detection show visual indicator for remaining field types, improve empty/null compare; change detect and show visual indicator now initially complete * Fix Vue template injection issue in vuet and qvt render modes for form-list find options parameter values, thanks to Taher for reporting this on the forum * In qvt render mode add support for shift-click to row-selection checkboxes like in gmail to select a range of items, a bit of user tedium reduction * Increase size of checkboxes * Allow include of screen theme resource script footer * Fix issue with changed field highlighting color in quasar dark mode --------- Co-authored-by: Acetousk <acetousk@gmail.com> Co-authored-by: David E. Jones <dej@dejc.com> Co-authored-by: pandor4u <103976470+pandor4u@users.noreply.github.com> Co-authored-by: aabiabdallah <aabiabdallah@gmail.com> Co-authored-by: Jens Hardings <jhp@moit.cl> Co-authored-by: acetousk <acetousk@users.noreply.github.com> Co-authored-by: newmann <huxinsheng88@hotmail.com> --------- Co-authored-by: David E Jones <dej@dejc.com> Co-authored-by: Acetousk <acetousk@gmail.com> Co-authored-by: pandor4u <103976470+pandor4u@users.noreply.github.com> Co-authored-by: aabiabdallah <aabiabdallah@gmail.com> Co-authored-by: Jens Hardings <jhp@moit.cl> Co-authored-by: acetousk <acetousk@users.noreply.github.com> Co-authored-by: newmann <huxinsheng88@hotmail.com>
dixitdeepak
added a commit
that referenced
this pull request
May 9, 2024
* In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In qvt and vuet screen macros add span v-pre around one more place in link macros, in qvt add span v-pre around all q-tooltip text * More vue template injection, add to button text in linkFormForm for vuet, qvt * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * Conflict (#13) * Add sessionId field to list screen for debugging * Changed header color to make it more obviously not production * Added Page Size to Log Viewer * In WebrootVue.qvt.css, updated rule for drawer background to only come into effect in non-mobile layouts. * In DefaultScreenMacros for vuet and qvt add paginate support to section-include when included section is a section-iterate with paginate=true; in qvt js don't show pagination widget if there is only one result * In WebrootVue.qvt.js add qLayoutMinHeight method to calculate a full height, useful for certain types of screens with particular or bottom instead of top focused layouts * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In vuet and qvt widgetTextValue macro handle case with drop-down that has dynamic-options plus list-options for pre-loaded values * Update vue to 2.7.14, quasar to 1.22.10; all seems to work well in partial tests of existing screens, minor version updates are hopefully backward compatible but worth keeping an eye out for issues * In qvt default screen macros add support for text-area.@autogrow attribute * Small updates to webroot build.gradle: update gradle-versions and gradle-minify plugins * Currency (moqui#217) * Add currency-hide-symbol attribute as a comlement to currency-unit-field, displaying the value without the currency symbol * Update AUTHORS file * Update ElFinder client to 2.1.62 and jqueryui to 1.13.2, there is a security notice for ElFinder for versions 2.1.61 and earlier, but it appears to only for the server-side PHP code which is not used in moqui; also updated jquery to 3.7.1 while at it * Fix submit on select drop down where there is one result (moqui#219) * Fix submit on select drop down where there is one result * Changes required for new Moqui SSO component (moqui#222) * In Login.ftl, added SSO tab and forms. This will only appear if SSO is configured. * In webroot-layout.css, increased the width of the forms from 340 to 380 so SSO tab doesn't overflow to new line. * In Qapps mode, add a expansion button to the ContainerBox (moqui#216) * In Qapps mode, add a expansion button to the ContainerBox * sign the AUTHORS file * Enable accordion in form field-groups using qvt rendering (moqui#221) * In qvt render mode fix m-form-column-config find parameter handling so they are passed through * In qvt render mode FTL macros add empty column for first/second/last rows if row selection is used in a form-list; in popup card for row selection add spacing around m-container-dialog to match spacing used by default for a form-single with field-row-big so that dialog and direct form submit buttons line up * For moqui-framework issue #623 add v-pre to vue template generated for label and link elements so that contents are not interpreted to avoid template injection from user-entered data * In qvt and vuet screen macros add span v-pre around one more place in link macros, in qvt add span v-pre around all q-tooltip text * More vue template injection, add to button text in linkFormForm for vuet, qvt * In qvt render mode change button-menu macro to not render a q-item if the child node has a condition attribute and that attribute evaluates to false * Form field change detection and in-field visual indicators, submit button visual indicator (moqui#225) * For qvt mode add m-form field change tracking support, some initial use in text-area, much more needed before done * In WebrootVue.qvt.js m-text-line pass through dense, outlined, and bg-color * In qvt default screen macros add submit button highlighting (disable outlined mode), add placeholders for other field types that still need to be finished and tested * More progress on form field change indicators: add support to m-form-link for find forms and such, add field change visual effects for drop-down, checkbox, radio, text-find; still more to do but now mostly for find forms which work but don't have visual indicators for all field types * In qvt render mode improve form field change detection to handle nulls and empty strings and arrays, also add support for date-find field type * In qvt render mode form change detection show visual indicator for remaining field types, improve empty/null compare; change detect and show visual indicator now initially complete * Fix Vue template injection issue in vuet and qvt render modes for form-list find options parameter values, thanks to Taher for reporting this on the forum * In qvt render mode add support for shift-click to row-selection checkboxes like in gmail to select a range of items, a bit of user tedium reduction * Increase size of checkboxes * Allow include of screen theme resource script footer * Fix issue with changed field highlighting color in quasar dark mode --------- Co-authored-by: Acetousk <acetousk@gmail.com> Co-authored-by: David E. Jones <dej@dejc.com> Co-authored-by: pandor4u <103976470+pandor4u@users.noreply.github.com> Co-authored-by: aabiabdallah <aabiabdallah@gmail.com> Co-authored-by: Jens Hardings <jhp@moit.cl> Co-authored-by: acetousk <acetousk@users.noreply.github.com> Co-authored-by: newmann <huxinsheng88@hotmail.com> --------- Co-authored-by: David E Jones <dej@dejc.com> Co-authored-by: Acetousk <acetousk@gmail.com> Co-authored-by: pandor4u <103976470+pandor4u@users.noreply.github.com> Co-authored-by: aabiabdallah <aabiabdallah@gmail.com> Co-authored-by: Jens Hardings <jhp@moit.cl> Co-authored-by: acetousk <acetousk@users.noreply.github.com> Co-authored-by: newmann <huxinsheng88@hotmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.