Skip to content

update qapps/vapps to vue3 and quasar2 #235

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.

Sign up for GitHub

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

Open
newmann wants to merge 2 commits into
base: vue3quasar2
Choose a base branch
from
Open

update qapps/vapps to vue3 and quasar2 #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc75fd
update qapps/vapps to vue3 and quasar2
newmann May 31, 2025
60a69dc
In QAPPS mode, entering an address in the browser address bar will ca…
newmann Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions base-component/tools/screen/Tools/Entity/SqlRunner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ along with this software (see the LICENSE.md file). If not, see
if (con != null) { try { con.close() } catch (Exception e) { /* Ignore */ } }
}
}
]]></script>
]]>
</script>
</actions>
<widgets>
<section-iterate name="Messages" list="messageList" entry="message"><widgets>
Expand All @@ -122,10 +123,12 @@ along with this software (see the LICENSE.md file). If not, see
<h3>Result Set ${columns?index + 1}</h3>
<#if columns?has_content>
<table class="table table-striped table-hover">
<tr class="header-row"><#list columns as column><td style="padding-right: 1em;">${column}</td></#list></tr>
<#if records?has_content><#list records as record>
<tr><#list record as curField><td style="padding-right: 1em;">${ec.l10n.format(curField, '')!"&nbsp;"}</td></#list></tr>
</#list></#if>
<tbody>
<tr class="header-row"><#list columns as column><td style="padding-right: 1em;">${column}</td></#list></tr>
<#if records?has_content><#list records as record>
<tr><#list record as curField><td style="padding-right: 1em;">${ec.l10n.format(curField, '')!"&nbsp;"}</td></#list></tr>
</#list></#if>
</tbody>
</table>
</#if>
</div>
Expand Down
16 changes: 11 additions & 5 deletions base-component/webroot/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,16 @@ def fileMap = [
"typeahead.js/0.11.1/typeahead.jquery.min.js":"",

"vue/2.7.14/vue.js":"",
"vue/2.7.14/vue.min.js":""
"vue/2.7.14/vue.min.js":"",
"vue/3.5.13/vue.global.js":"",
"vue/3.5.13/vue.global.prod.min.js":"",
"vue-router/4.5.0/vue-router.global.js":""
]

def jsdelivrBase = "https://cdn.jsdelivr.net/npm/"
def jsdelivrList = ["quasar@1.22.10/dist/quasar.min.css", "quasar@1.22.10/dist/quasar.umd.min.js"]
def jsdelivrBase = "https://gcore.jsdelivr.net/npm/"
def jsdelivrList = ["quasar@1.22.10/dist/quasar.min.css", "quasar@1.22.10/dist/quasar.umd.min.js",
"quasar@2.16.5/dist/quasar.prod.css", "quasar@2.16.5/dist/quasar.umd.prod.js", "vue3-sfc-loader@0.9.5/dist/vue3-sfc-loader.min.js"
]

String getTargetPath(String sourcePath, String targetPath) {
if (!targetPath) {
Expand Down Expand Up @@ -170,9 +175,10 @@ htmlJs.add(libsPath + '/jstree/jstree.min.js')

def vuetJs = []
// Vue JS
vuetJs.add(libsPath + '/vue/vue.min.js')
vuetJs.add(libsPath + '/vue/vue.global.prod.min.js')
// http-vue-loader
vuetJs.add(webrootPath + '/js/http-vue-loader/httpVueLoader.js')
//vuetJs.add(webrootPath + '/js/http-vue-loader/httpVueLoader.js')
vuetJs.add(libsPath + '/vue3-sfc-loader/vue3-sfc-loader.min.js')
// Vue root component instance, in footer so runs after page loaded
vuetJs.add(webrootPath + '/js/WebrootVue.min.js')

Expand Down
5 changes: 3 additions & 2 deletions base-component/webroot/data/WebrootQuasarThemeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ along with this software (see the LICENSE.md file). If not, see
AND material icons requires very different syntax with <i class="material-icons-outlined">invert_colors</i> (2 parts) unlike fa with <i class="fa fa-shopping-cart"></i> (1 part) -->
<moqui.screen.ScreenThemeResource screenThemeId="DEFAULT_QUASAR" sequenceNum="3" resourceTypeEnumId="STRT_STYLESHEET"
resourceValue="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons"/>
<!-- <moqui.screen.ScreenThemeResource screenThemeId="DEFAULT_QUASAR" sequenceNum="4" resourceTypeEnumId="STRT_STYLESHEET"-->
<!-- resourceValue="/libs/quasar/quasar.min.css"/>-->
<moqui.screen.ScreenThemeResource screenThemeId="DEFAULT_QUASAR" sequenceNum="4" resourceTypeEnumId="STRT_STYLESHEET"
resourceValue="/libs/quasar/quasar.min.css"/>

resourceValue="/libs/quasar/quasar.prod.css"/>
<!-- Add external theme(s) here -->
<moqui.screen.ScreenThemeResource screenThemeId="DEFAULT_QUASAR" sequenceNum="10" resourceTypeEnumId="STRT_STYLESHEET" resourceValue=""/>

Expand Down
3 changes: 2 additions & 1 deletion base-component/webroot/screen/includes/WebrootVue.qvt.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<div id="apps-root" style="display:none;"><#-- NOTE: webrootVue component attaches here, uses this and below for template -->
<input type="hidden" id="confMoquiSessionToken" value="${ec.web.sessionToken}">
<input type="hidden" id="confAppHost" value="${ec.web.getHostName(true)}">
<input type="hidden" id="confAppRootPath" value="${ec.web.servletContext.contextPath}">
Expand All @@ -30,6 +29,8 @@ along with this software (see the LICENSE.md file). If not, see

<#assign headerClass = "bg-black text-white">

<div id="apps-root" ><#-- style="display:none;" NOTE: webrootVue component attaches here, uses this and below for template -->

<#-- for layout options see: https://quasar.dev/layout/layout -->
<#-- to build a layout use the handy Quasar tool: https://quasar.dev/layout-builder -->
<q-layout view="hHh LpR fFf">
Expand Down
3 changes: 2 additions & 1 deletion base-component/webroot/screen/includes/WebrootVue.vuet.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<div id="apps-root"><#-- NOTE: webrootVue component attaches here, uses this and below for template -->
<input type="hidden" id="confMoquiSessionToken" value="${ec.web.sessionToken}">
<input type="hidden" id="confAppHost" value="${ec.web.getHostName(true)}">
<input type="hidden" id="confAppRootPath" value="${ec.web.servletContext.contextPath}">
Expand All @@ -22,6 +21,8 @@ along with this software (see the LICENSE.md file). If not, see
<input type="hidden" id="confOuterStyle" value="${ec.user.getPreference("OUTER_STYLE")!"bg-light"}">
<#assign navbarCompList = sri.getThemeValues("STRT_HEADER_NAVBAR_COMP")>
<#list navbarCompList! as navbarCompUrl><input type="hidden" class="confNavPluginUrl" value="${navbarCompUrl}"></#list>

<div id="apps-root"><#-- NOTE: webrootVue component attaches here, uses this and below for template -->
<#if hideNav! != 'true'>
<div id="top"><nav class="navbar navbar-inverse navbar-fixed-top"><#-- navbar-fixed-top navbar-static-top --><div class="container-fluid">
<#-- Brand and toggle get grouped for better mobile display -->
Expand Down
13 changes: 9 additions & 4 deletions base-component/webroot/screen/webroot/css/WebrootVue.qvt.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* This software is in the public domain under CC0 1.0 Universal plus a Grant of Patent License. */

a { color:var(--q-color-primary); text-decoration:none; }
a { color:var(--q-primary); text-decoration:none; }
.q-menu a, .q-toolbar a { color:inherit; }

.text-success { color:var(--q-color-positive); }
.text-danger { color:var(--q-color-negative); }
.text-success { color:var(--q-positive); }
.text-danger { color:var(--q-negative); }
.text-mono { font-family: monospace,monospace; }
strong, .text-strong { font-weight:bold; }

Expand Down Expand Up @@ -79,7 +79,7 @@ form.q-form { width:100%; }
.q-field--disabled .q-field__control > div { opacity:1 !important; }
/* END q-field label move */

.q-field--focused .q-field__input { border-bottom: var(--q-color-primary) solid 1px; margin-left:8px; }
.q-field--focused .q-field__input { border-bottom: var(--q-primary) solid 1px; margin-left:8px; }

.q-field--dense .q-field__marginal { height:auto; min-height:40px; }
.q-field__prepend { max-width:75%; }
Expand Down Expand Up @@ -214,3 +214,8 @@ ul.float-plain.condensed li { margin: 0 4px 0 0; padding: 4px; }
}

.ScreenTreeNested { margin: 4px 0 4px 12px; padding: 0 0 0 12px; border-left: 1px dashed lightgrey; }

.editable-label { color: rgb(66, 139, 202); }
.form-order-by a:hover { color: blue; }
.form-order-by a.active { color: red; }
.form-order-by a.active:hover { color: darkred; }
Loading