@farris/jit-engine 1.3.348 → 1.3.350

package/lib/mobileapp/vue/static/babel.config.js

@@ -1,13 +1,13 @@
-module.exports = {
-  presets: [
-    [
-      '@babel/env',
-      {
-        targets: '> 0.25%, not dead',
-        modules: false,
-        loose: true,
-      },
-    ],
-    '@babel/typescript',
-  ],
-};
+module.exports = {
+  presets: [
+    [
+      '@babel/env',
+      {
+        targets: '> 0.25%, not dead',
+        modules: false,
+        loose: true,
+      },
+    ],
+    '@babel/typescript',
+  ],
+};

package/lib/mobileapp/vue/static/src/main.ts

@@ -1,10 +1,10 @@
-import { AppCreator } from '@farris/mobile-vue-adapter';
-import vant from "vant";
-import App from './app.vue'
-import router from './router'
-import FarrisMobileUI from '@farris/mobile-ui';
-import FarrisMobileBusinessUI from '@farris/mobile-business-ui';
-
-const app = AppCreator.createApp(App);
-app.use(router).use(vant).use(FarrisMobileUI).use(FarrisMobileBusinessUI)
+import { AppCreator } from '@farris/mobile-vue-adapter';
+import vant from "vant";
+import App from './app.vue'
+import router from './router'
+import FarrisMobileUI from '@farris/mobile-ui';
+import FarrisMobileBusinessUI from '@farris/mobile-business-ui';
+
+const app = AppCreator.createApp(App);
+app.use(router).use(vant).use(FarrisMobileUI).use(FarrisMobileBusinessUI)
 app.mount('#app')

package/lib/mobileapp/vue/static/src/shims-vue.d.ts

@@ -1,32 +1,32 @@
-
-
-declare module '*.vue' {
-  import { defineComponent } from 'vue'
-  const component: ReturnType<typeof defineComponent>
-  export default component
-}
-
-declare module 'vue/types/vue' {
-  import { App, AppOptions, ViewModel, ViewModelOptions } from '@farris/mobile-devkit';
-
-  interface Vue {
-
-    $app: App;
-
-    $viewModel: ViewModel;
-
-    $createApp(options: AppOptions): void;
-
-    $getApp(): App;
-
-    $createViewModel(options: ViewModelOptions): void;
-
-    $getViewModel(): ViewModel;
-
-    [key: string]:any;
-
-  }
-
-}
-
-
+
+
+declare module '*.vue' {
+  import { defineComponent } from 'vue'
+  const component: ReturnType<typeof defineComponent>
+  export default component
+}
+
+declare module 'vue/types/vue' {
+  import { App, AppOptions, ViewModel, ViewModelOptions } from '@farris/mobile-devkit';
+
+  interface Vue {
+
+    $app: App;
+
+    $viewModel: ViewModel;
+
+    $createApp(options: AppOptions): void;
+
+    $getApp(): App;
+
+    $createViewModel(options: ViewModelOptions): void;
+
+    $getViewModel(): ViewModel;
+
+    [key: string]:any;
+
+  }
+
+}
+
+

package/lib/mobileapp/vue/static/tsconfig.json

@@ -1,20 +1,20 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "target": "ES3",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "ESNext",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    "allowJs": true,                       /* Allow javascript files to be compiled. */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": false,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "experimentalDecorators": true,
-    "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    "lib": ["ESNext","DOM","DOM.Iterable","ScriptHost"],                             /* Specify library files to be included in the compilation. */
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules","dist"]
-}
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "target": "ES3",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "ESNext",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "allowJs": true,                       /* Allow javascript files to be compiled. */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    "noImplicitAny": false,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
+    "experimentalDecorators": true,
+    "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    "lib": ["ESNext","DOM","DOM.Iterable","ScriptHost"],                             /* Specify library files to be included in the compilation. */
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules","dist"]
+}

package/lib/mobileapp/vue/utility/parameter-collector/page-component-collector/page-component-ref-parameter.js

@@ -14,8 +14,8 @@ class PageComponentRefParameter {
         if (!obj) {
             return;
         }
-        const keys = `
-    id,type,component,visible
+        const keys = `
+    id,type,component,visible
     `;
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {

package/lib/mobileapp/vue/utility/template-generator/page-component-control-generator.js

@@ -9,12 +9,12 @@ class PageComponentControlGenerator {
         if (componentConfig && componentConfig.pageComponentControl && utility_1.ToolHelper.isArray(componentConfig.pageComponentControl.parameterList)) {
             const controlTypeList = [];
             componentConfig.pageComponentControl.parameterList.forEach((item) => {
-                generateString += `
+                generateString += `
 import {${item.controlType.controlType}} from "${item.controlType.controlSource}";`;
                 controlTypeList.push(item.controlType.controlType);
             });
             controlTypeList.forEach((item) => {
-                generateString += `
+                generateString += `
 Vue.use(${item});`;
             });
         }

package/lib/mobileapp/vue/utility/template-generator/page-component-ref-generator.js

@@ -8,7 +8,7 @@ class PageComponentRefGenerator {
         const componentConfig = generateParams.value;
         if (utility_1.ToolHelper.isArray(componentConfig.pageComponentRef, false)) {
             componentConfig.pageComponentRef.forEach((item) => {
-                generateString += `
+                generateString += `
 import ${"App" + item.componentName} from "../${item.component.toLowerCase()}/${item.component.toLowerCase()}.component.vue";`;
             });
         }

package/lib/mobileapp/vue/utility/template-generator/page-statemachine-generator.js

@@ -8,60 +8,60 @@ class PageStateMachineGenerator extends abstract_page_generator_1.AbstractPageGe
         const variable = generateParams.devkit;
         let generateString = "";
         const eol = this.eol;
-        generateString += `
-import { Injectable } from '@angular/core';
-import { StateMachine, State, NgState, RenderState, NgRenderState, Action, NgAction } from '@farris/devkit';
+        generateString += `
+import { Injectable } from '@angular/core';
+import { StateMachine, State, NgState, RenderState, NgRenderState, Action, NgAction } from '@farris/devkit';
 `;
-        generateString += `
-@Injectable()
-export class ${this.convertNullToEmpty(variable.externalPrefix)}${variable.name} extends StateMachine {
+        generateString += `
+@Injectable()
+export class ${this.convertNullToEmpty(variable.externalPrefix)}${variable.name} extends StateMachine {
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.ngStates, false)) {
             variable.ngStates.forEach((ngState) => {
                 if (ngState.initialState) {
-                    generateString += `
-    @NgState({
-        initialState: true
+                    generateString += `
+    @NgState({
+        initialState: true
     })`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     @NgState()`;
                 }
-                generateString += `
+                generateString += `
     ${ngState.name}: State;`;
                 generateString += eol;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngRenderStates, false)) {
             variable.ngRenderStates.forEach((ngRenderState) => {
-                generateString += `
-    @NgRenderState({
-        render: ${ngRenderState.render}
-    })
+                generateString += `
+    @NgRenderState({
+        render: ${ngRenderState.render}
+    })
     ${ngRenderState.name}: RenderState;`;
                 generateString += this.eol;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngActions, false)) {
             variable.ngActions.forEach((ngAction) => {
-                generateString += `
+                generateString += `
     @NgAction({`;
                 if (ngAction.precondition) {
-                    generateString += `
+                    generateString += `
         precondition: ${ngAction.precondition},`;
                 }
                 if (ngAction.transitTo) {
-                    generateString += `
+                    generateString += `
         transitTo: '${ngAction.transitTo}'`;
                 }
-                generateString += `
-    })
+                generateString += `
+    })
     ${ngAction.name}: Action;`;
                 generateString += this.eol;
             });
         }
-        generateString += `
+        generateString += `
 }`;
         return generateString;
     }

package/lib/template/ui/kendo/farris-query-solution.pug

@@ -12,6 +12,7 @@ farris-querysolution(id=variable.replacedId?""+variable.replacedId:undefined  cl
   '[isControlInline]'=(variable.isControlInline || variable.isControlInline == false)?""+variable.isControlInline:undefined
   '[defaultConfigs]'!=variable.binding?""+variable.binding.value:undefined  '[enableInitQuery]'=(variable.enableInitQuery || variable.enableInitQuery==false)?""+variable.enableInitQuery:undefined
   '[showCompleteLabel]'=variable.showCompleteLabel?""+variable.showCompleteLabel.value:undefined '[isFold]'=variable.expanded?"!"+(variable.expanded.value):undefined
+  '(isFoldChange)'=variable.isFoldChange?variable.isFoldChange:undefined
   'farris-querysolution-event-bind'  '[enableHistory]'=variable.enableHistory?""+variable.enableHistory.value:undefined
   '[resetFieldConfigs]'=variable.resetFieldConfigs?""+variable.resetFieldConfigs:undefined  '[openAdvancedMode]'=variable.openAdvancedMode?""+variable.openAdvancedMode.value:undefined
   '[filterText]'=variable.filterTextLang?""+variable.filterTextLang:undefined '[queryAfterValueChange]'=variable.queryAfterValueChange?""+variable.queryAfterValueChange.value:undefined

package/lib/template/ui/mobilevue/action-bar.pug

@@ -1,10 +1,10 @@
--variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
-
-fm-action-bar(
-  v-if=variable.visible?variable.visible+"":"false"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  id=variable.id?"" + variable.id:undefined 
-  :btns=variable.btns?"" + variable.btns:undefined 
-)
-  
+-variable.readonly = variable.readonly?String(variable.readonly).replace(/"/g, "'")+"":undefined;
+
+fm-action-bar(
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  id=variable.id?"" + variable.id:undefined 
+  :btns=variable.btns?"" + variable.btns:undefined 
+)
+  

package/lib/template/ui/mobilevue/banner.pug

@@ -1,5 +1,5 @@
-div(class="fm-banner-warpper")
-  div(class="fm-banner-title")
-    | !{variable.title}
-  div(class="fm-banner-title-sub") 
+div(class="fm-banner-warpper")
+  div(class="fm-banner-title")
+    | !{variable.title}
+  div(class="fm-banner-title-sub") 
     | !{variable.subTitle}

package/lib/template/ui/mobilevue/component-ref.pug

@@ -1,3 +1,3 @@
-//- -var variable = {id:'id',"component":"Delivery-component", "componentName":"DeliveryComponent"};
-
-#{'app-' + variable.componentName.toLowerCase()}
+//- -var variable = {id:'id',"component":"Delivery-component", "componentName":"DeliveryComponent"};
+
+#{'app-' + variable.componentName.toLowerCase()}

package/lib/template/ui/mobilevue/field-set.pug

@@ -10,7 +10,9 @@ fm-collapse-item(
   position=variable.isInner ? 'bottom' : 'top'
   :collapse=variable.collapse?String(variable.collapse): undefined
 )&attributes(attrs)
-  if(variable.headerTemplate)
+  if(variable.headerTemplate && !/<template\s+#title\s*>/.test(variable.headerTemplate))
     template(#title)
       | !{variable.headerTemplate}
+  if(variable.headerTemplate && /<template\s+#title\s*>/.test(variable.headerTemplate))
+    | !{variable.headerTemplate}
   | {{content}}

package/lib/template/ui/mobilevue/image-uploader.pug

@@ -1,15 +1,15 @@
--var imageInfo =`$formatUtils.fileInfo(currentEntityData.${variable.binding.bindingPath}, '${variable.rootId}')` 
--var extendContext =`{ rootId: '${variable.rootId}', formId: '${variable.parentDirName}', fieldPath: '/${variable.binding.bindingPath}'}` 
-
-div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
-  fm-image-uploader(
-    style=(variable.appearance && variable.appearance.style)  
-    class=variable.className
-    id=variable.id?"" + variable.id:undefined 
-    title=variable.title?variable.title:undefined 
-    :disabled!=variable.disabled?variable.disabled+"":undefined
-    :imageInfo!=imageInfo
-    :extendContext!=extendContext
-  )
-    
- 
+-var imageInfo =`$formatUtils.fileInfo(currentEntityData.${variable.binding.bindingPath}, '${variable.rootId}')` 
+-var extendContext =`{ rootId: '${variable.rootId}', formId: '${variable.parentDirName}', fieldPath: '/${variable.binding.bindingPath}'}` 
+
+div(class="fm-input-wrapper" v-if=variable.visible?variable.visible+"":"false")
+  fm-image-uploader(
+    style=(variable.appearance && variable.appearance.style)  
+    class=variable.className
+    id=variable.id?"" + variable.id:undefined 
+    title=variable.title?variable.title:undefined 
+    :disabled!=variable.disabled?variable.disabled+"":undefined
+    :imageInfo!=imageInfo
+    :extendContext!=extendContext
+  )
+    
+ 

package/lib/template/ui/mobilevue/sidebar-item.pug

@@ -1,9 +1,9 @@
-fm-sidebar-item(
-  id=variable.id?"" + variable.id:undefined 
-  v-if=variable.visible?variable.visible+"":"false"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  title=variable.title?"" + variable.title:undefined 
-  name=variable.name?"" + variable.name:undefined 
-)
-  | {{content}}
+fm-sidebar-item(
+  id=variable.id?"" + variable.id:undefined 
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  title=variable.title?"" + variable.title:undefined 
+  name=variable.name?"" + variable.name:undefined 
+)
+  | {{content}}

package/lib/template/ui/mobilevue/sidebar.pug

@@ -1,11 +1,11 @@
-fm-sidebar(
-  id=variable.id?"" + variable.id:undefined 
-  v-if=variable.visible?variable.visible+"":"false"
-  style=(variable.appearance && variable.appearance.style)  
-  class=(variable.appearance && variable.appearance.class)  
-  modelValue=variable.selected?"" + variable.selected:undefined 
-  sidebarWidth=variable.sidebarWidth?"" + variable.sidebarWidth:undefined 
-  @change=variable.change?"" + variable.change:undefined 
-)
-  | {{content}}
-  
+fm-sidebar(
+  id=variable.id?"" + variable.id:undefined 
+  v-if=variable.visible?variable.visible+"":"false"
+  style=(variable.appearance && variable.appearance.style)  
+  class=(variable.appearance && variable.appearance.class)  
+  modelValue=variable.selected?"" + variable.selected:undefined 
+  sidebarWidth=variable.sidebarWidth?"" + variable.sidebarWidth:undefined 
+  @change=variable.change?"" + variable.change:undefined 
+)
+  | {{content}}
+  

package/lib/template/ui/mobilevue/static-text.pug

@@ -1,2 +1,2 @@
-div(class="fm-static-text-common")
+div(class="fm-static-text-common")
   | !{variable.html}

package/lib/template/ui/mobilevue/steps.pug

@@ -1,9 +1,9 @@
-fm-steps(
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-  v-if=variable.visible?variable.visible+"":"false"
-  :steps=variable.size?""+variable.size:undefined 
-  direction=variable.size?""+variable.size:undefined 
-  :current=variable.size?""+variable.size:undefined 
-  :fill=variable.size?""+variable.size:undefined 
+fm-steps(
+  class=(variable.appearance && variable.appearance.class)
+  style=(variable.appearance && variable.appearance.style)
+  v-if=variable.visible?variable.visible+"":"false"
+  :steps=variable.size?""+variable.size:undefined 
+  direction=variable.size?""+variable.size:undefined 
+  :current=variable.size?""+variable.size:undefined 
+  :fill=variable.size?""+variable.size:undefined 
 )

package/lib/template/ui/mobilevue/toolbar.pug

@@ -1,6 +1,6 @@
-div(
-  v-if=variable.visible?variable.visible+"":"false"
-  class=(variable.appearance && variable.appearance.class)
-  style=(variable.appearance && variable.appearance.style)
-)
+div(
+  v-if=variable.visible?variable.visible+"":"false"
+  class=(variable.appearance && variable.appearance.class)
+  style=(variable.appearance && variable.appearance.style)
+)
   | {{content}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/jit-engine",
-  "version": "1.3.348",
+  "version": "1.3.350",
   "description": "",
   "main": "./lib/index.js",
   "bin": {

package/lib/mobileapp/vue/static/.npmignore

@@ -1,13 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-dist-rollup/
-npm-debug.log
-yarn-error.log
-
-# Editor directories and files
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln