npm - @farris/jit-engine - Versions diffs - 1.3.149 → 1.3.152 - Mend

@farris/jit-engine 1.3.149 → 1.3.152

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

package/README.md CHANGED Viewed

@@ -1,60 +1,7 @@
-1.3.149
-    增加审批意见
-1.3.147
-    树表支持多表头
-    列表字段超链接支持格式化
-1.3.146
-    grid增加showScheme
-1.3.145
-    树表增加showGotoInput
-    控件增加实例引用
-1.3.144
-    子表集成组织
-1.3.142
-    运行时定制支持分SU预览主动加载脚本
-1.3.139
-    list-nav 参数调整
-1.3.138
-    集成组织组件
-    树帮助增加cascade
-    内存溢出调整
-1.3.135
-    OA模板帮助调整
-1.3.134
-    OA模板完善
-1.3.128
-    集成OA模板
 1.3.121
     移动支持省市区组件生成
-1.3.119
-    支持运行模式
 1.3.118
     表达式-组合表单命名空间调整

package/lib/domstructure/ui/commands/toolbar.js CHANGED Viewed

@@ -17,7 +17,7 @@ class ToolBar extends command_container_1.CommandContainer {
             return;
         }
         this.items = [];
-        const keys = 'items,btnAlign';
+        const keys = 'items,btnAlign,buttonSize,popDirection';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
                 if (key == "items") {

package/lib/domstructure/ui/commands/toolbar.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"toolbar.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/commands/toolbar.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,8CAA4E;AAE5E,MAAa,OAAQ,SAAQ,oCAAgB;~~IAK3C~~,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAChD;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,~~gBAAgB~~,CAAC;~~QAC9B~~,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,GAAG,IAAI,OAAO,EAAE;oBAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,sCAA4B,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,~~EAAC~~,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;~~iBACvK~~;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACtB;aACF;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC;QACvF,IAAI,CAAC,mBAAmB,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC;QAClG,IAAI,CAAC,0BAA0B,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,2BAA2B,CAAC;QAChH,IAAI,CAAC,cAAc,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,GAAG,UAAU,CAAC;IACtG,CAAC;IAED,MAAM;QACJ,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;~~AA3CD~~,~~0BA2CC~~"}
1	+ {"version":3,"file":"toolbar.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/commands/toolbar.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,8CAA4E;AAE5E,MAAa,OAAQ,SAAQ,oCAAgB;IAO3C,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAChD;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,wCAAwC,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,GAAG,IAAI,OAAO,EAAE;oBAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,sCAA4B,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;iBACxK;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACtB;aACF;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC;QACvF,IAAI,CAAC,mBAAmB,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC;QAClG,IAAI,CAAC,0BAA0B,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,2BAA2B,CAAC;QAChH,IAAI,CAAC,cAAc,CAAC,GAAG,GAAG,oBAAU,CAAC,WAAW,CAAC,oBAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,GAAG,UAAU,CAAC;IACtG,CAAC;IAED,MAAM;QACJ,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AA7CD,0BA6CC"}

package/lib/domstructure/ui/data/fields/form/input-group.js CHANGED Viewed

@@ -23,6 +23,7 @@ class InputGroup extends input_field_1.InputField {
         enableClear,
         groupText,
         customCls,
+        textAlign,
         showButtonWhenDisabled,
         onClear,
         valueChange,

package/lib/domstructure/ui/data/fields/form/input-group.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"input-group.js","sourceRoot":"","sources":["../../../../../../src/domstructure/ui/data/fields/form/input-group.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,oDAA8G;AAC9G,iIAAwH;AAExH,sKAA8J;AAS9J,MAAa,UAAW,SAAQ,wBAAU;~~IA0BtC~~,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG~~;;;;;;;;;eASN~~,CAAC;QACR,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,IAAI,OAAO,IAAI,GAAG,IAAI,QAAQ,EAAE;oBAC/E,IAAI,CAAC,GAAG,CAAC,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,qBAAW,CAAC,uBAAuB,CAAC,CAAC;iBAC9G;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;SACnC;QACD,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;YACd,IAAI,CAAC,kBAAkB,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SACvF;QAID,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,YAAY,IAAI,IAAI,CAAC,SAAS,IAAI,mBAAmB,CAAC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,EAAE;YAC/H,MAAM,WAAW,GAAG,kFAAqC,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChG,IAAI,CAAC,KAAK,GAAG,gCAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,iCAAiC,GAAG,WAAW,GAAG,iBAAiB,EAAE,IAAI,CAAC,CAAC;SACzJ;QAED,IAAI,CAAC,iBAAiB,GAAG,yEAAgC,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEvF,IAAI,CAAC,mBAAmB,GAAG,yEAAgC,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE3F,IAAI,CAAC,qBAAqB,GAAG,6BAAmB,CAAC,6BAA6B,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAE3H,IAAI,CAAC,oBAAoB,GAAG,kFAAqC,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5G,CAAC;IAED,MAAM;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,EAAE,YAAY;YACpB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;YACnD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC9C,CAAC,CAAC;IACP,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;CACJ;~~AAvGD~~,~~gCAuGC~~"}
1	+ {"version":3,"file":"input-group.js","sourceRoot":"","sources":["../../../../../../src/domstructure/ui/data/fields/form/input-group.ts"],"names":[],"mappings":"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"}

package/lib/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.js CHANGED Viewed

@@ -5,6 +5,7 @@ const jit_constant_1 = require("../../../utility/jit-constant");
 const event_viewModel_modifier_1 = require("../../../utility/event-viewModel-modifier");
 const toolhepler_1 = require("../../../utility/toolhepler");
 const base_title_component_1 = require("../common/base-title-component");
+const component_fileupload_preview_creator_1 = require("../../../utility/devkit/component-fileupload-preview-creator");
 class FarrisFileUploadAndPreview extends base_title_component_1.BaseTitleComponent {
     constructor(param) {
         super(param);
@@ -38,9 +39,6 @@ class FarrisFileUploadAndPreview extends base_title_component_1.BaseTitleCompone
                 else if (key == "previewReadonly" || key == "previewVisible" || key == "previewEnableMulti") {
                     this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], true, this.externalComponentNameSpace, this.id);
                 }
-                else if (key == "previewDefaultRename") {
-                    this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], "", this.externalComponentNameSpace, this.id);
-                }
                 else if (key == "uploadDisabled") {
                     this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);
                 }
@@ -99,9 +97,14 @@ class FarrisFileUploadAndPreview extends base_title_component_1.BaseTitleCompone
         }
         if (!this.previewEnableRename) {
             this.previewDefaultRename = null;
+            this.previewDefaultNameLangName = null;
+        }
+        else {
+            this.previewDefaultNameLangName = component_fileupload_preview_creator_1.ComponentFileUploadPreviewCreator.createPreviewDefaultNameLangName(this.id);
         }
         this.defaultI18nValue = this.title;
         this.serializedExtendServerConfig = this.generateExtendServerConfig();
+        this.uploadSelectTextLangName = component_fileupload_preview_creator_1.ComponentFileUploadPreviewCreator.createUploadSelectTextName(this.id);
     }
     generateExtendServerConfig() {
         let generateString = "{";

package/lib/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"farris-file-upload-preview.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.ts"],"names":[],"mappings":";;;AAAA,gEAA4D;AAC5D,wFAAmF;AACnF,4DAAyD;AAEzD,yEAAoE;~~AAKpE~~,MAAa,0BAA2B,SAAQ,yCAAkB;~~IA8B9D~~,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;~~QAtBjB~~,wBAAmB,GAAG,KAAK,CAAC;QAS5B,oBAAe,GAAG,MAAM,CAAC;QACzB,wBAAmB,GAAG,IAAI,CAAC;~~QAavB~~,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,uBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,MAAM,IAAI,GAAG,8TAA8T,CAAC;QAC5U,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,QAAQ,EAAE;oBACjB,IAAI,CAAC,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClG;qBAAM,IAAI,GAAG,IAAI,mBAAmB,IAAI,GAAG,IAAI,eAAe,EAAE;oBAC7D,IAAI,CAAC,GAAG,CAAC,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClG;qBAAM,IAAI,GAAG,IAAI,kBAAkB,IAAI,GAAG,IAAI,qBAAqB,IAAI,GAAG,IAAI,iBAAiB,EAAE;oBAC9F,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,iDAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,0BAAW,CAAC,uBAAuB,CAAC,CAAC;qBAC/G;iBACJ;qBAAM,IAAI,GAAG,IAAI,iBAAiB,IAAI,GAAG,IAAI,gBAAgB,IAAI,GAAG,IAAI,oBAAoB,EAAE;oBAC3F,IAAI,CAAC,GAAG,CAAC,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClG;qBAAM,IAAI,GAAG,IAAI,~~sBAAsB,EAAE;oBACtC,IAAI,CAAC,GAAG,CAAC,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAChG;qBAAM,IAAI,GAAG,IAAI,~~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~~SACpC~~;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC;QAEnC,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;~~IAC1E~~,CAAC;IAEO,0BAA0B;QAC9B,IAAI,cAAc,GAAG,GAAG,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,cAAc,IAAI,cAAc,IAAI,CAAC,MAAM,GAAG,CAAC;SAClD;QACD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAClC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,cAAc,IAAI,GAAG,CAAC;aACzB;YACD,cAAc,IAAI,aAAa,uBAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;SACxF;QACD,cAAc,IAAI,GAAG,CAAC;QACtB,OAAO,cAAc,CAAC;IAC1B,CAAC;CACJ;~~AAvID~~,~~gEAuIC~~"}
1	+ {"version":3,"file":"farris-file-upload-preview.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.ts"],"names":[],"mappings":";;;AAAA,gEAA4D;AAC5D,wFAAmF;AACnF,4DAAyD;AAEzD,yEAAoE;AAEpE,uHAAiH;AAKjH,MAAa,0BAA2B,SAAQ,yCAAkB;IAgC9D,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAvBjB,wBAAmB,GAAG,KAAK,CAAC;QAS5B,oBAAe,GAAG,MAAM,CAAC;QACzB,wBAAmB,GAAG,IAAI,CAAC;QAcvB,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,uBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,MAAM,IAAI,GAAG,8TAA8T,CAAC;QAC5U,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,QAAQ,EAAE;oBACjB,IAAI,CAAC,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClG;qBAAM,IAAI,GAAG,IAAI,mBAAmB,IAAI,GAAG,IAAI,eAAe,EAAE;oBAC7D,IAAI,CAAC,GAAG,CAAC,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClG;qBAAM,IAAI,GAAG,IAAI,kBAAkB,IAAI,GAAG,IAAI,qBAAqB,IAAI,GAAG,IAAI,iBAAiB,EAAE;oBAC9F,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,GAAG,iDAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,0BAAW,CAAC,uBAAuB,CAAC,CAAC;qBAC/G;iBACJ;qBAAM,IAAI,GAAG,IAAI,iBAAiB,IAAI,GAAG,IAAI,gBAAgB,IAAI,GAAG,IAAI,oBAAoB,EAAE;oBAC3F,IAAI,CAAC,GAAG,CAAC,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClG;qBAAM,IAAI,GAAG,IAAI,gBAAgB,EAAE;oBAChC,IAAI,CAAC,GAAG,CAAC,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBACnG;qBAAM,IAAI,GAAG,IAAI,YAAY,EAAE;oBAC5B,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,UAAU,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACnG,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;4BAC7B,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;yBACvD;qBACJ;iBACJ;qBAAM,IAAI,GAAG,IAAI,aAAa,EAAE;oBAC7B,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;wBACV,IAAI,CAAC,WAAW,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACpG,IAAI,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE;4BAC9B,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;yBACzD;qBACJ;iBACJ;qBAAM,IAAI,GAAG,KAAK,aAAa,EAAE;oBAC9B,IAAI,CAAC,WAAW,GAAG,uBAAU,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;iBACzG;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,IAAI,CAAC,aAAa,GAAG,uBAAU,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACvG;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,cAAc,GAAG,uBAAU,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACzG;QACD,IAAI,CAAC,kBAAkB,GAAG;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;SAC/C,CAAC;QAEF,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,qBAAqB,CAAC;YAC9E,CAAC,uBAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,uBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YACtJ,OAAO,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;SACpD;QACD,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1B,MAAM,eAAe,GAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;YACtD,IAAI,eAAe,EAAE;gBACjB,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7C,IAAI,YAAY,GAAG,EAAE,CAAC;gBACtB,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,uBAAU,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC7F,eAAe,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE;oBACpD,YAAY,IAAI,IAAI,IAAI,GAAG,CAAC;oBAC5B,IAAI,KAAK,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;wBACpC,YAAY,IAAI,GAAG,CAAC;qBACvB;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,aAAa,GAAG,sEAAsE,YAAY,WAAW,CAAC;aACtH;SACJ;QAGD,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC3B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;YACjC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;SAC1C;aAAM;YACH,IAAI,CAAC,0BAA0B,GAAG,wEAAiC,CAAC,gCAAgC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACjH;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC;QAEnC,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAEtE,IAAI,CAAC,wBAAwB,GAAG,wEAAiC,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1G,CAAC;IAEO,0BAA0B;QAC9B,IAAI,cAAc,GAAG,GAAG,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,cAAc,IAAI,cAAc,IAAI,CAAC,MAAM,GAAG,CAAC;SAClD;QACD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAClC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,cAAc,IAAI,GAAG,CAAC;aACzB;YACD,cAAc,IAAI,aAAa,uBAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;SACxF;QACD,cAAc,IAAI,GAAG,CAAC;QACtB,OAAO,cAAc,CAAC;IAC1B,CAAC;CACJ;AA5ID,gEA4IC"}

package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js CHANGED Viewed

@@ -51,7 +51,7 @@ class AppIndexVueManager {
         indexVueParameter.imports = devkitValue.module.imports;
         indexVueParameter.metaDataConfig = generateParam.metaDataConfig;
         indexVueParameter.keepAlive = (_b = (_a = generateParam.value.ui) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.keepAlive;
-        indexVueParameter.hasExpressions = !!((_d = (_c = generateParam.value.ui) === null || _c === void 0 ? void 0 : _c.module) === null || _d === void 0 ? void 0 : _d.expressions);
+        indexVueParameter.hasExpressions = ((_d = (_c = generateParam.value.ui) === null || _c === void 0 ? void 0 : _c.module) === null || _d === void 0 ? void 0 : _d.expressions) ? generateParam.value.ui.module.expressions.length > 0 : false;
         const indexVueContext = new file_generator_context_1.FileGeneratorContext();
         indexVueContext.basePath = path.normalize(path.join(generateParam.metaDataConfig.publishPath, mobileapp_vue_constant_1.MobileAppVueConstant.SrcPathName, mobileapp_vue_constant_1.MobileAppVueConstant.AppsPathName, generateParam.frm_code));
         indexVueContext.fileName = "index.vue";

package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAG7B,uHAAgH;AAChH,qFAAgF;AAChF,uGAAiG;AAEjG,6GAAsG;AACtG,gHAAyG;AACzG,iFAA4E;AAC5E,+HAAwH;AAExH,MAAa,kBAAkB;IAC3B,MAAM,CAAC,QAAQ,CAAC,aAGf;;QACG,MAAM,WAAW,GAAc,aAAa,CAAC,KAAK,CAAC;QACnD,MAAM,yBAAyB,GAAiC,IAAI,+DAA4B,EAAE,CAAC;QACnG,MAAM,uBAAuB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACjF,uBAAuB,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;QACzE,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAE3F,MAAM,6BAA6B,GAAiC,IAAI,uEAAgC,EAAE,CAAC;QAC3G,MAAM,2BAA2B,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACrF,2BAA2B,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3E,MAAM,4BAA4B,GAAG,6BAA6B,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;QAEzG,MAAM,qBAAqB,GAA0B,IAAI,gDAAqB,EAAE,CAAC;QACjF,MAAM,gBAAgB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAA0B,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAGlG,MAAM,iBAAiB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACjF,iBAAiB,CAAC,cAAc,GAAG,sBAAsB,CAAC,WAAW,CAAC;QACtE,iBAAiB,CAAC,kBAAkB,GAAG,4BAA4B,CAAC,WAAW,CAAC;QAChF,iBAAiB,CAAC,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC;QAChE,iBAAiB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;QACpD,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QACvD,iBAAiB,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QAChE,iBAAiB,CAAC,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,SAAS,CAAC;QACzE,iBAAiB,CAAC,cAAc,GAAG,~~CAAC,CAAC,~~CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,MAAM,0CAAE,WAAW,~~CAAA~~,CAAA;~~QAEhF~~,MAAM,eAAe,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACzE,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,EAAE,6CAAoB,CAAC,WAAW,EAAE,6CAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5L,eAAe,CAAC,QAAQ,GAAG,WAAW,CAAC;QACvC,eAAe,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACtD,MAAM,oBAAoB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACpF,oBAAoB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;CACJ;AAtCD,gDAsCC"}
1	+ {"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAG7B,uHAAgH;AAChH,qFAAgF;AAChF,uGAAiG;AAEjG,6GAAsG;AACtG,gHAAyG;AACzG,iFAA4E;AAC5E,+HAAwH;AAExH,MAAa,kBAAkB;IAC3B,MAAM,CAAC,QAAQ,CAAC,aAGf;;QACG,MAAM,WAAW,GAAc,aAAa,CAAC,KAAK,CAAC;QACnD,MAAM,yBAAyB,GAAiC,IAAI,+DAA4B,EAAE,CAAC;QACnG,MAAM,uBAAuB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACjF,uBAAuB,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;QACzE,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAE3F,MAAM,6BAA6B,GAAiC,IAAI,uEAAgC,EAAE,CAAC;QAC3G,MAAM,2BAA2B,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACrF,2BAA2B,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3E,MAAM,4BAA4B,GAAG,6BAA6B,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;QAEzG,MAAM,qBAAqB,GAA0B,IAAI,gDAAqB,EAAE,CAAC;QACjF,MAAM,gBAAgB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAA0B,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAGlG,MAAM,iBAAiB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACjF,iBAAiB,CAAC,cAAc,GAAG,sBAAsB,CAAC,WAAW,CAAC;QACtE,iBAAiB,CAAC,kBAAkB,GAAG,4BAA4B,CAAC,WAAW,CAAC;QAChF,iBAAiB,CAAC,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC;QAChE,iBAAiB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;QACpD,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QACvD,iBAAiB,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QAChE,iBAAiB,CAAC,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,SAAS,CAAC;QACzE,iBAAiB,CAAC,cAAc,GAAG,CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,MAAM,0CAAE,WAAW,EAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAE7I,MAAM,eAAe,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACzE,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,EAAE,6CAAoB,CAAC,WAAW,EAAE,6CAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5L,eAAe,CAAC,QAAQ,GAAG,WAAW,CAAC;QACvC,eAAe,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACtD,MAAM,oBAAoB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACpF,oBAAoB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;CACJ;AAtCD,gDAsCC"}

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js CHANGED Viewed

@@ -62,7 +62,8 @@ export default{
           ...ModelProviders,
           { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
           { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
-          { provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},
+          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
           { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
           ...COMMAND_SERVICES_APP_PROVIDERS
         ]

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,oBAAoB,GAA4B,OAAO,CAAC,iBAAiB,CAAA;QAC/E,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,GACf,GAAG,oBAAoB,CAAA;QACxB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,cAAc,CAAA;QACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACzE,MAAM,2BAA2B,GAAG,cAAc;YAChD,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,IAAI,QAAQ,GAAG;YAC3E,CAAC,CAAC,EAAE,CAAA;QAGN,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;;QAKd,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;;EAYJ,kBAAkB;EAClB,cAAc;;;;aAIH,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;eAmBX,QAAQ~~;;;;;kDAK2B~~,2BAA2B;;;;;;;;;~~CAS5E~~,CAAA;QAGG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;~~AA7FD~~,~~0DA6FC~~"}
1	+ {"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,oBAAoB,GAA4B,OAAO,CAAC,iBAAiB,CAAA;QAC/E,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,GACf,GAAG,oBAAoB,CAAA;QACxB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,cAAc,CAAA;QACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACzE,MAAM,2BAA2B,GAAG,cAAc;YAChD,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,IAAI,QAAQ,GAAG;YAC3E,CAAC,CAAC,EAAE,CAAA;QAGN,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;;QAKd,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;;EAYJ,kBAAkB;EAClB,cAAc;;;;aAIH,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;eAmBX,QAAQ;;;;;;YAMV,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAG;;;;;;;;;CASzH,CAAA;QAGG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AA9FD,0DA8FC"}

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js CHANGED Viewed

@@ -75,6 +75,7 @@ export default
                 this.getOnLoadDataCommand(componentConfig) +
                 '}});'
             : ''}
+        ${this.getOnBeforeInitCommand(componentConfig)}
         beforeCreateByVueAdapter && beforeCreateByVueAdapter(this);
         // 初始加载数据
         //this.pageLoad();
@@ -122,6 +123,12 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         }
         return '';
     }
+    getOnBeforeInitCommand(componentConfig) {
+        if (componentConfig.onBeforeInit) {
+            return componentConfig.onBeforeInit;
+        }
+        return '';
+    }
     getOnActivedCommand(componentConfig) {
         if (componentConfig.onActived) {
             return componentConfig.onActived;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAElE,oFAA8E;AAY9E,MAAa,sBAAuB,SAAQ,+CAAqB;IAC/D,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,SAAS,GAAsC,OAAO,CAAC,iBAAiB,CAAA;QAC9E,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAA;QACjD,MAAM,YAAY,GAAG,2CAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC1E,MAAM,eAAe,GAAuB,SAAS,CAAC,eAAe,CAAA;QACrE,MAAM,cAAc,GAAG;;EAEzB,SAAS,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;UAqBd,YAAY,aAAa,WAAW,CAAC,WAAW,EAAE;;EAE1D,SAAS,CAAC,YAAY;;;;;cAKV,SAAS,CAAC,kBAAkB;;;;;;;;;;;;UAahC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,IAAI;YAC/D,CAAC,CAAC,EACN;gCACwB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC;UAE/D,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,0DAA0D;gBAC1D,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;gBACtC,OAAO;YACT,CAAC,CAAC,EACN;;;UAGE,SAAS,CAAC,eAAe;;;UAGzB,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;UAEtC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;YACxC,CAAC,CAAC,wCAAwC;gBACxC,WAAW;gBACX,kDAAkD;gBAClD,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;gBAC1C,MAAM;YACR,CAAC,CAAC,EACN;;;;;;;~~UAOE~~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~~AA7ND~~,~~wDA6NC~~"}
1	+ {"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":"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"}

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.js CHANGED Viewed

@@ -94,15 +94,33 @@ import { ${arrCanImportConverter.join(", ")} } from "@farris/kendo-binding";`;
         if (validRules && validRules.length > 0) {
             const result = [];
             validRules && validRules.forEach(rule => {
+                const { type, message, constraints } = rule;
+                let constraintsStr = '';
                 if (rule.type.includes('Function')) {
-                    const { type, message, constraints } = rule;
-                    const constraintsStr = `constraints:[${constraints[0].replace("\\r\\n", "")}]`;
-                    const str = JSON.stringify({ type, message });
-                    result.push(`${str.slice(0, -1)}, ${constraintsStr} ${str.slice(-1)}`);
+                    constraintsStr = `constraints:[${constraints[0].replace("\\r\\n", "")}]`;
                 }
                 else {
-                    result.push(JSON.stringify(rule));
+                    constraintsStr = 'constraints:[';
+                    constraints.map((item, index) => {
+                        if (index > 0) {
+                            constraintsStr = constraintsStr + ',';
+                        }
+                        if (item && toolhepler_1.ToolHelper.isObject(item)) {
+                            if (item.type == "Variable") {
+                                constraintsStr = `${constraintsStr}${item.value}`;
+                            }
+                        }
+                        else if (toolhepler_1.ToolHelper.isBoolean(item)) {
+                            constraintsStr = `${constraintsStr}${item}`;
+                        }
+                        else {
+                            return constraintsStr = `${constraintsStr}'${item}'`;
+                        }
+                    });
+                    constraintsStr = constraintsStr + ']';
                 }
+                const str = JSON.stringify({ type, message });
+                result.push(`${str.slice(0, -1)}, ${constraintsStr} ${str.slice(-1)}`);
             });
             return `validRules: [${result.join(',')}]`;
         }

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-form-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.ts"],"names":[],"mappings":"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~~MAAM~~,~~EAAC~~,~~IAAI~~,~~EAAC~~,OAAO,~~EAAC~~,WAAW,EAAC,GAAG,~~IAAI~~,~~CAAA~~;~~oBACvC~~,~~MAAM~~,cAAc,GAAG,~~gBAAgB~~,~~WAAW~~,CAAC,CAAC,CAAC,CAAC,~~OAAO~~,CAAC,~~QAAQ~~,EAAE,EAAE,CAAC,GAAG,CAAA;~~oBAC9E~~,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,IAAI,EAAC,OAAO,EAAC,CAAC,CAAA;~~oBAC1C~~,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,KAAK,cAAc,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;~~iBACtE;qBAAM;oBACL~~,~~MAAM,~~CAAC,~~IAAI,~~CAAC,~~IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,~~CAAA;~~iBAClC;YACH,CAAC,CAAC,CAAA;~~YACF,OAAO,gBAAgB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;SAC3C;aAAM;YACL,OAAO,EAAE,CAAA;SACV;IAEH,CAAC;CACF;~~AAvKD~~,~~0DAuKC~~"}
1	+ {"version":3,"file":"page-form-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.ts"],"names":[],"mappings":"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"}

package/lib/mobileapp/vue/domstructure/devkit/component/vue-component.js CHANGED Viewed

@@ -16,7 +16,7 @@ class VueComponentConfig {
             return;
         }
         this.toolbars = [];
-        const keys = `id,name,componentType,template,repositoryName,
+        const keys = `id,name,componentType,template,repositoryName,onBeforeInit
         viewModelName,form,stateMachine,states,appearance,pageComponentControl,pageComponentRef,onLoadData,goBack,goBackForWF,title,
         handlers,onInit,onActived,customClass,keepAlive`;
         Object.keys(obj).forEach(key => {
@@ -32,7 +32,7 @@ class VueComponentConfig {
                         this[key] = obj[key];
                     }
                 }
-                else if (key == "onInit" || key == "onLoadData" || key == "onActived") {
+                else if (key == "onInit" || key == "onBeforeInit" || key == "onLoadData" || key == "onActived") {
                     this[key] = vue_event_viewmodel_modifier_1.VueEventViewModelModifier.modify(obj[key], true, true);
                 }
                 else {

package/lib/mobileapp/vue/domstructure/devkit/component/vue-component.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vue-component.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/devkit/component/vue-component.ts"],"names":[],"mappings":";;;AAAA,kEAA+D;AAG/D,gGAA0F;AAS1F,MAAa,kBAAkB;~~IAqB3B~~,YAAY,KAAmB;QAC3B,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,MAAM,IAAI,GAAG;;wDAEmC,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,UAAU,EAAE;oBACnB,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,uBAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE;wBAChD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;wBACnB,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;4BAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7B,CAAC,CAAC,CAAC;qBACN;yBAAM;wBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;qBACxB;iBACJ;qBAAM,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,IAAI,YAAY,IAAI,GAAG,IAAI,WAAW,EAAE;~~oBACrE~~,IAAI,CAAC,GAAG,CAAC,GAAG,wDAAyB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;iBACtE;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;~~AAxDD~~,~~gDAwDC~~"}
1	+ {"version":3,"file":"vue-component.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/devkit/component/vue-component.ts"],"names":[],"mappings":";;;AAAA,kEAA+D;AAG/D,gGAA0F;AAS1F,MAAa,kBAAkB;IAsB3B,YAAY,KAAmB;QAC3B,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,MAAM,IAAI,GAAG;;wDAEmC,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,UAAU,EAAE;oBACnB,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,uBAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE;wBAChD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;wBACnB,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;4BAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7B,CAAC,CAAC,CAAC;qBACN;yBAAM;wBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;qBACxB;iBACJ;qBAAM,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,IAAI,cAAc,IAAI,GAAG,IAAI,YAAY,IAAI,GAAG,IAAI,WAAW,EAAE;oBAC9F,IAAI,CAAC,GAAG,CAAC,GAAG,wDAAyB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;iBACtE;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAzDD,gDAyDC"}

package/lib/mobileapp/vue/domstructure/ui/button/button.js CHANGED Viewed

@@ -18,12 +18,7 @@ class VueButton extends vue_base_component_1.VueBaseComponent {
         const keys = 'text,disabled,type,click,visible,template,displayType';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
-                if (key === 'visible') {
-                    this[key] = `getVisibleState(${obj[key]}, {id: '${this.id}'})`;
-                }
-                else {
-                    this[key] = obj[key];
-                }
+                this[key] = obj[key];
             }
         });
     }

package/lib/mobileapp/vue/domstructure/ui/button/button.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"button.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/ui/button/button.ts"],"names":[],"mappings":";;;AAAA,8DAAyD;AAEzD,MAAa,SAAU,SAAQ,qCAAgB;IAQ3C,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,uDAAuD,CAAC;QACrE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;~~gBACpB~~,~~IAAG,GAAG,KAAK,SAAS,EAAE;oBAClB,~~IAAI,CAAC,GAAG,CAAC,GAAG,~~mBAAmB,~~GAAG,CAAC,GAAG,CAAC,~~WAAW,IAAI,~~CAAC~~,EAAE,KAAK,CAAA~~;~~iBACjE~~;~~qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;~~QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAGJ;AAnCD,8BAmCC"}
1	+ {"version":3,"file":"button.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/ui/button/button.ts"],"names":[],"mappings":";;;AAAA,8DAAyD;AAEzD,MAAa,SAAU,SAAQ,qCAAgB;IAQ3C,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,uDAAuD,CAAC;QACrE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAKpB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;aACxB;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAGJ;AAnCD,8BAmCC"}

package/lib/mobileapp/vue/domstructure/ui/date-time-picker/date-picker.js CHANGED Viewed

@@ -19,7 +19,12 @@ class VueDatePicker extends vue_input_component_1.VueInputComponent {
         const keys = 'showType,format,rightTemplate,minValue,maxValue,useCurrentSecond';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
-                this[key] = obj[key];
+                if (key === 'maxValue' || key === 'minValue') {
+                    this[key] = this.getValue(obj[key]);
+                }
+                else {
+                    this[key] = obj[key];
+                }
             }
         });
     }

package/lib/mobileapp/vue/domstructure/ui/date-time-picker/date-picker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"date-picker.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/ui/date-time-picker/date-picker.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAE3D,MAAa,aAAc,SAAQ,uCAAiB;IAchD,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAPjB,aAAQ,GAAW,MAAM,CAAC;QAStB,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,kEAAkE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;~~aACxB~~;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAGJ;~~AArCD~~,~~sCAqCC~~"}
1	+ {"version":3,"file":"date-picker.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/ui/date-time-picker/date-picker.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAE3D,MAAa,aAAc,SAAQ,uCAAiB;IAchD,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAPjB,aAAQ,GAAW,MAAM,CAAC;QAStB,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,kEAAkE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAG,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,UAAU,EAAE;oBACzC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;iBACvC;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAGJ;AAzCD,sCAyCC"}

package/lib/mobileapp/vue/domstructure/ui/text-area/text-area.js CHANGED Viewed

@@ -18,7 +18,12 @@ class VueTextArea extends vue_input_component_1.VueInputComponent {
         const keys = 'showWordLimit,maxlength,autoSize';
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
-                this[key] = obj[key];
+                if (key === 'maxlength') {
+                    this[key] = this.getValue(obj[key]);
+                }
+                else {
+                    this[key] = obj[key];
+                }
             }
         });
         if (this.autoSize) {

package/lib/mobileapp/vue/domstructure/ui/text-area/text-area.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"text-area.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/ui/text-area/text-area.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAE3D,MAAa,WAAY,SAAQ,uCAAiB;IAY9C,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,kCAAkC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;~~aACxB~~;QACL,CAAC,CAAC,CAAC;QACH,IAAG,IAAI,CAAC,QAAQ,EAAE;YACd,MAAM,QAAQ,GAAQ,EAAE,CAAA;YACxB,IAAG,GAAG,CAAC,iBAAiB,EAAE;gBACtB,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,iBAAiB,CAAA;aAC7C;YACD,IAAG,GAAG,CAAC,iBAAiB,EAAE;gBACtB,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,iBAAiB,CAAA;aAC7C;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;SAC3C;IACL,CAAC;CAGJ;~~AA7CD~~,~~kCA6CC~~"}
1	+ {"version":3,"file":"text-area.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/domstructure/ui/text-area/text-area.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAE3D,MAAa,WAAY,SAAQ,uCAAiB;IAY9C,YAAY,KAAU;QAClB,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC3B;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,kCAAkC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAG,GAAG,KAAK,WAAW,EAAE;oBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;iBACtC;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;QACL,CAAC,CAAC,CAAC;QACH,IAAG,IAAI,CAAC,QAAQ,EAAE;YACd,MAAM,QAAQ,GAAQ,EAAE,CAAA;YACxB,IAAG,GAAG,CAAC,iBAAiB,EAAE;gBACtB,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,iBAAiB,CAAA;aAC7C;YACD,IAAG,GAAG,CAAC,iBAAiB,EAAE;gBACtB,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,iBAAiB,CAAA;aAC7C;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;SAC3C;IACL,CAAC;CAGJ;AAjDD,kCAiDC"}

package/lib/mobileapp/vue/domstructure/ui/vue-base-component.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VueBaseComponent = void 0;
-const vue_visible_1 = require("./common/vue-visible");
 const vue_appearance_1 = require("./common/vue-appearance");
 const vue_size_1 = require("./common/vue-size");
 const toolhepler_1 = require("../../../../utility/toolhepler");
@@ -27,18 +26,12 @@ class VueBaseComponent {
                     case 'size':
                         this[key] = new vue_size_1.VueSize(obj[key]);
                         break;
-                    case 'visible':
-                        this[key] = new vue_visible_1.VueVisible(obj[key]);
-                        break;
                     default:
                         this[key] = obj[key];
                         break;
                 }
             }
         });
-        if (!this.visible) {
-            this.visible = new vue_visible_1.VueVisible(true);
-        }
         if (this.id) {
             this.replacedId = toolhepler_1.ToolHelper.replaceDotToXiaHuaXian(this.id);
         }

package/lib/mobileapp/vue/domstructure/ui/vue-base-component.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vue-base-component.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/domstructure/ui/vue-base-component.ts"],"names":[],"mappings":";;;~~AACA~~,~~sDAAiD;AACjD,~~4DAAuD;AACvD,gDAA2C;AAC3C,+DAA2D;AAE3D,MAAa,gBAAgB;IAc3B,YAAY,KAAmB;QAC7B,IAAI,GAAQ,CAAA;QACZ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACxB;aAAM;YACL,GAAG,GAAG,KAAK,CAAA;SACZ;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAM;SACP;QAED,MAAM,IAAI,GAAG,2CAA2C,CAAA;QACxD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,QAAQ,GAAG,EAAE;oBACX,KAAK,YAAY;wBACf,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,8BAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;wBACvC,MAAK;oBACP,KAAK,MAAM;wBACT,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,kBAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;wBACjC,MAAK;~~oBACP,KAAK,SAAS~~;~~wBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,wBAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;wBACpC,MAAK;oBACP;~~wBACE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;wBACpB,MAAK;iBACR;aACF;QACH,CAAC,CAAC,CAAA;~~QAGF~~,IAAI,~~CAAC,~~IAAI,CAAC,~~OAAO,~~EAAE~~;YACjB~~,~~IAAI,CAAC,OAAO,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,CAAA;SACpC;QAED,IAAI,IAAI,CAAC,~~EAAE~~,EAAE~~;YACX,IAAI,CAAC,UAAU,GAAG,uBAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SAC7D;IACH,CAAC;IACD,MAAM,CAAC,KAAK,CAAI,GAAM;QACpB,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAA;IAC1C,CAAC;IACD,UAAU,CAAC,KAAU,EAAE,QAAa;QAClC,IAAG,uBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAA;SAC3B;QACD,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAhED,4CAgEC"}
1	+ {"version":3,"file":"vue-base-component.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/domstructure/ui/vue-base-component.ts"],"names":[],"mappings":";;;AAEA,4DAAuD;AACvD,gDAA2C;AAC3C,+DAA2D;AAE3D,MAAa,gBAAgB;IAc3B,YAAY,KAAmB;QAC7B,IAAI,GAAQ,CAAA;QACZ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACxB;aAAM;YACL,GAAG,GAAG,KAAK,CAAA;SACZ;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAM;SACP;QAED,MAAM,IAAI,GAAG,2CAA2C,CAAA;QACxD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,QAAQ,GAAG,EAAE;oBACX,KAAK,YAAY;wBACf,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,8BAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;wBACvC,MAAK;oBACP,KAAK,MAAM;wBACT,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,kBAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;wBACjC,MAAK;oBAIP;wBACE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;wBACpB,MAAK;iBACR;aACF;QACH,CAAC,CAAC,CAAA;QAOF,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,UAAU,GAAG,uBAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SAC7D;IACH,CAAC;IACD,MAAM,CAAC,KAAK,CAAI,GAAM;QACpB,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAA;IAC1C,CAAC;IACD,UAAU,CAAC,KAAU,EAAE,QAAa;QAClC,IAAG,uBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAA;SAC3B;QACD,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAhED,4CAgEC"}

package/lib/mobileapp/vue/domstructure/ui/vue-input-component.js CHANGED Viewed

@@ -52,7 +52,7 @@ class VueInputComponent extends vue_base_component_1.VueBaseComponent {
                         this[key] = this.formatValue(obj[key], 'readonly');
                         break;
                     case 'require':
-                        this[key] = this.formatValue(obj[key], 'required');
+                        this[key] = this.formatValue(this.getValue(obj[key]), 'required');
                         break;
                     default:
                         this[key] = obj[key];
@@ -71,6 +71,7 @@ class VueInputComponent extends vue_base_component_1.VueBaseComponent {
     }
     formatValue(value, name) {
         var _a;
+        return value;
         let resultVlaue = value;
         if (value && toolhepler_1.ToolHelper.isObject(value)) {
             if (value.type === 'Expression') {
@@ -81,6 +82,14 @@ class VueInputComponent extends vue_base_component_1.VueBaseComponent {
         const path = ((_a = this.obj) === null || _a === void 0 ? void 0 : _a.path) ? this.obj.path.replace(/\./g, '/') : '';
         return `get${_name}State(${resultVlaue}, {id: '${this.id}', bindingPath: '${path}'})`;
     }
+    getValue(data) {
+        if (data && toolhepler_1.ToolHelper.isObject(data)) {
+            if (data.type == "Variable") {
+                return data.value;
+            }
+        }
+        return data;
+    }
 }
 exports.VueInputComponent = VueInputComponent;
 //# sourceMappingURL=vue-input-component.js.map

package/lib/mobileapp/vue/domstructure/ui/vue-input-component.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vue-input-component.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/domstructure/ui/vue-input-component.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,6DAAuD;AAEvD,MAAa,iBAAkB,SAAQ,qCAAgB;IASrD,YAAY,KAAU;QACpB,KAAK,CAAC,KAAK,CAAC,CAAA;QAEZ,IAAI,GAAQ,CAAA;QACZ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACxB;aAAM;YACL,GAAG,GAAG,KAAK,CAAA;SACZ;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,GAAG,EAAE;YACR,OAAM;SACP;QAED,MAAM,IAAI,GAAG;YACX,IAAI;YACJ,OAAO;YACP,SAAS;YACT,SAAS;YACT,UAAU;YACV,UAAU;YACV,SAAS;YACT,aAAa;YACb,YAAY;YACZ,WAAW;YACX,SAAS;YACT,WAAW;YACX,YAAY;YACZ,UAAU;YACV,UAAU;YACV,QAAQ;YACR,YAAY;YACZ,iBAAiB;YACjB,cAAc;YACd,eAAe;YACf,eAAe;YACf,eAAe;YACf,eAAe;SAChB,CAAA;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,QAAQ,GAAG,EAAE;oBACX,KAAK,SAAS;wBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAA;wBACjD,MAAK;oBACP,KAAK,UAAU;wBACb,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAA;wBAClD,MAAK;oBACP,KAAK,SAAS;wBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAA;~~wBAClD~~,MAAK;oBACP;wBACE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;wBACpB,MAAK;iBACR;aACF;QACH,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,YAAY;YACf,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC/B,CAAC,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,6BAA6B,IAAI,CAAC,OAAO,CAAC,IAAI,2BAA2B;gBACpG,CAAC,CAAC,SAAS,CAAA;QACf,IAAI,CAAC,SAAS;YACZ,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,GAAG;gBACH,CAAC,IAAI,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC9D,CAAC;IACD,WAAW,CAAC,KAAU,EAAE,IAAY;;QAClC,IAAI,WAAW,GAAG,KAAK,CAAA;QACvB,IAAI,KAAK,IAAI,uBAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACvC,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC/B,WAAW,GAAG,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAA;aAClD;SACF;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC3D,MAAM,IAAI,GAAG,CAAA,MAAA,IAAI,CAAC,GAAG,0CAAE,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACpE,OAAO,MAAM,KAAK,SAAS,WAAW,WAAW,IAAI,CAAC,EAAE,oBAAoB,IAAI,KAAK,CAAA;IACvF,CAAC;CACF;~~AAtFD~~,~~8CAsFC~~"}
1	+ {"version":3,"file":"vue-input-component.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/domstructure/ui/vue-input-component.ts"],"names":[],"mappings":"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"}

package/lib/mobileapp/vue/utility/devkit/vue-component-creator.js CHANGED Viewed

@@ -34,6 +34,7 @@ class VueComponentCreator {
             states: vue_devkit_object_name_creator_1.VueDevkitObjectNameCreator.getDevkitObjectNameWithType("s", vm.name),
             handlers: handlers,
             onInit: obj.onInit,
+            onBeforeInit: obj.onBeforeInit,
             onActived: obj.onActived,
             onLoadData: obj.onLoadData,
             goBack: obj.goBack,

package/lib/mobileapp/vue/utility/devkit/vue-component-creator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vue-component-creator.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/utility/devkit/vue-component-creator.ts"],"names":[],"mappings":"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~~AA7JD~~,~~kDA6JC~~"}
1	+ {"version":3,"file":"vue-component-creator.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/utility/devkit/vue-component-creator.ts"],"names":[],"mappings":";;;AACA,qFAA8E;AAC9E,+DAA4D;AAC5D,mEAA+D;AAC/D,0EAAoE;AACpE,8FAAgG;AAChG,8DAAyD;AACzD,+HAAyH;AAQzH,MAAa,mBAAmB;IAC5B,gBAAwB,CAAC;IACzB,MAAM,CAAC,cAAc;QACjB,OAAO,IAAI,mBAAmB,EAAE,CAAC;IACrC,CAAC;IAWD,eAAe,CAAC,GAAQ,EAAE,EAAO,EAAE,UAAkB,EAAE,IAAS,EAAE,cAA+B,EAAE,qBAA6B;QAC5H,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;YAC9B,QAAQ,CAAC,IAAI,CAAC,2DAA0B,CAAC,2BAA2B,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAC;QACH,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAe,CAAC;QACnD,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,gBAAqB,EAAE,EAAE;YAC7C,IAAI,gBAAgB,CAAC,IAAI,IAAI,uBAAuB,EAAE;gBAClD,mBAAmB,CAAC,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;aACpI;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAQ;YAChB,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,uBAAU,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,KAAK,EAAE,uBAAU,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;YAC/B,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,cAAc,EAAE,2DAA0B,CAAC,2BAA2B,CAAC,GAAG,EAAE,uBAAU,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;YACtG,aAAa,EAAE,uBAAU,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;YAC3C,MAAM,EAAE,2DAA0B,CAAC,2BAA2B,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC;YAC5E,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,EAAE;YAChB,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,EAAE;YACb,mBAAmB,EAAE,cAAc,CAAC,mBAAmB;SAC1D,CAAC;QAEF,IAAI,mBAAmB,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;YAC/C,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5G,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;SAC/E;QAED,IAAI,GAAG,CAAC,aAAa,IAAI,OAAO,EAAE;YAE9B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAC7D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAGhD,IAAI,IAAI,EAAE;gBACN,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC;gBAC/O,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aACvI;YAED,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SAC7E;QAGD,IAAI,uBAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,EAAE;YAC7C,GAAG,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,QAAa,EAAE,EAAE;gBACvC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;gBACjG,IAAI,QAAQ,CAAC,oBAAoB,CAAC,EAAE;oBAChC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;iBAC3E;gBACD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;oBAClB,MAAM,EAAE,uBAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC;iBACtG,CAAC,CAAC;YAEP,CAAC,CAAC,CAAC;SACN;QAGD,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,qBAAqB,CAAC,CAAC;QAGnE,IAAI,EAAE,CAAC,IAAI,EAAE;YACT,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACjC;QAED,IAAI,EAAE,CAAC,YAAY,EAAE;YACjB,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;SACjD;QAED,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE;YACxC,MAAM,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;SAC/C;QAED,IAAI,uBAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YACzC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC1B,MAAM,aAAa,GAAG,gDAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzH,MAAM,GAAG,GAAG,qCAAgB,CAAC,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;gBACtF,IAAI,CAAC,GAAG,EAAE;oBACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,aAAa,EAAE,CAAC,CAAC;iBAC7D;gBACD,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,0BAAW,CAAC,kBAAkB,CAAC,GAAG,qBAAqB,CAAC;gBACxE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE1C,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;aACjC;iBAAM;gBACH,MAAM,iBAAiB,GAAQ,EAAE,CAAC;gBAElC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,KAAa,EAAE,EAAE;oBAC9C,MAAM,aAAa,GAAG,gDAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;oBACxF,MAAM,GAAG,GAAG,qCAAgB,CAAC,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;oBACtF,IAAI,CAAC,GAAG,EAAE;wBACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,aAAa,EAAE,CAAC,CAAC;qBAC7D;oBACD,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,0BAAW,CAAC,kBAAkB,CAAC,GAAG,qBAAqB,CAAC;oBAC5E,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;oBAE9C,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACrC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC;aAC1C;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAYO,yBAAyB,CAAC,GAAQ,EAAE,MAAW,EAAE,qBAA6B;QAElF,MAAM,6BAA6B,GAAkC,IAAI,wDAA6B,EAAE,CAAC;QACzG,MAAM,mCAAmC,GAAG,6BAA6B,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvF,IAAI,mCAAmC,CAAC,OAAO,EAAE;YAC7C,MAAM,CAAC,sBAAsB,CAAC,GAAG,mCAAmC,CAAC,OAAO,CAAC;SAChF;QAED,MAAM,yBAAyB,GAA8B,IAAI,wDAAyB,EAAE,CAAC;QAC7F,MAAM,yBAAyB,GAAG,yBAAyB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzE,IAAI,yBAAyB,IAAI,yBAAyB,CAAC,OAAO,EAAE;YAChE,MAAM,CAAC,kBAAkB,CAAC,GAAG,yBAAyB,CAAC,OAAO,CAAC;SAClE;IAGL,CAAC;CACJ;AA9JD,kDA8JC"}

package/lib/mobileapp/vue/utility/devkit/vue-viewmodels-creator.js CHANGED Viewed

@@ -418,15 +418,9 @@ class VueViewModelsCreator {
                 });
             }
             else {
-                const findService = lodash_1.default.find(serviceRefs, function (o) {
+                item.serviceName = lodash_1.default.find(serviceRefs, function (o) {
                     return o.cmpId == item.serviceRefId;
-                });
-                if (!findService) {
-                    const notFoundMessage = "找不到对应的命令，请检查！" + JSON.stringify(item);
-                    logger_helper_1.LoggerHelper.log(notFoundMessage, logger_level_1.LoggerLevel.Error);
-                    throw new Error(notFoundMessage);
-                }
-                item.serviceName = findService.alias;
+                }).alias;
             }
         }
         else {