@farris/jit-engine 1.3.72 → 1.3.78

package/README.md

@@ -1,3 +1,16 @@
+1.3.78
+
+    datepicker 最大值、最小值支持校验
+    移动审批修正
+
+1.3.77
+
+    移动增加表达式
+
+1.3.76
+
+    集成附件上传预览组件
+
 1.3.72
 
     筛选方案集成resetFields

package/lib/domstructure/devkit/viewmodel/form/form.js

@@ -47,16 +47,34 @@ class Control extends i18n_resource_1.I18nResource {
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {
                 if (key === 'maxValue') {
-                    this.validRules.push(new FormValidRule({
-                        type: 'maxValue',
-                        constraints: [obj[key]]
-                    }));
+                    if (obj[key]) {
+                        const maxBindingValue = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], null);
+                        let canAddRule = true;
+                        if (maxBindingValue.isVariable || maxBindingValue.isExpression || maxBindingValue.isForm) {
+                            canAddRule = false;
+                        }
+                        if (canAddRule) {
+                            this.validRules.push(new FormValidRule({
+                                type: 'maxValue',
+                                constraints: [obj[key]]
+                            }));
+                        }
+                    }
                 }
                 else if (key === 'minValue') {
-                    this.validRules.push(new FormValidRule({
-                        type: 'minValue',
-                        constraints: [obj[key]]
-                    }));
+                    if (obj[key]) {
+                        let canAddRule = true;
+                        const minBindingValue = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], null);
+                        if (minBindingValue.isVariable || minBindingValue.isExpression || minBindingValue.isForm) {
+                            canAddRule = false;
+                        }
+                        if (canAddRule) {
+                            this.validRules.push(new FormValidRule({
+                                type: 'minValue',
+                                constraints: [obj[key]]
+                            }));
+                        }
+                    }
                 }
                 else if (key === "required" || key === "require") {
                     if (obj[key] === 'true' || obj[key] == true || (obj[key] && utility_1.ToolHelper.isRequireWithBinding(obj[key]))) {

package/lib/domstructure/devkit/viewmodel/form/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/form/form.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../src/domstructure/devkit/viewmodel/form/form.ts"],"names":[],"mappings":"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"}

package/lib/domstructure/ui/common/binding.js

@@ -15,6 +15,13 @@ class Binding {
             this.value = param.value;
             this.type = this.value.type;
             this.useQuote = param.useQuote;
+            this.path = param.path;
+            this.fullPath = param.fullPath;
+            this.bindingPath = param.bindingPath;
+            this.expressionId = param.expressionId;
+            this.isExpression = param.isExpression;
+            this.isVariable = param.isVariable;
+            this.isForm = param.isForm;
             return;
         }
         const externalComponentNameSpace = options.externalComponentNameSpace;
@@ -100,7 +107,10 @@ class Binding {
             "type": this.type,
             "target": this.target,
             "path": this.path,
-            "fullPath": this.fullPath
+            "fullPath": this.fullPath,
+            "isExpression": this.isExpression,
+            "isForm": this.isForm,
+            "isVariable": this.isVariable
         };
     }
 }

package/lib/domstructure/ui/common/binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/binding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/common/binding.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FarrisFileUploadAndPreview = void 0;
+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 basecomponent_1 = require("../common/basecomponent");
+class FarrisFileUploadAndPreview extends basecomponent_1.BaseComponent {
+    constructor(param) {
+        super(param);
+        this.enableUploadedCount = false;
+        this.previewShowType = "list";
+        this.previewEnableRename = true;
+        let obj;
+        if (typeof param === 'string') {
+            obj = toolhepler_1.ToolHelper.convertToJsonOrDefault(param);
+        }
+        else {
+            obj = param;
+        }
+        if (!obj) {
+            return;
+        }
+        const keys = 'rootId,formId,uploadSelectText,uploadEnableMulti,uploadedCount,enableUploadedCount,extendDatas,uploadOptions,fUploadDoneEvent,fUploadRemovedEvent,previewReadonly,previewVisible,previewEnableMulti,previewEnableRename,fileRemoveEvent,uploadVisible,uploadDisabled,fieldIdKey,fileNameKey';
+        Object.keys(obj).forEach(key => {
+            if (keys.includes(key)) {
+                if (key == "formId") {
+                    this.formId = toolhepler_1.ToolHelper.createBinding(obj[key], "", this.externalComponentNameSpace);
+                }
+                else if (key == "uploadEnableMulti" || key == "uploadVisible") {
+                    this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], true, this.externalComponentNameSpace);
+                }
+                else if (key == "fUploadDoneEvent" || key == "fUploadRemovedEvent" || key == "fileRemoveEvent") {
+                    if (obj[key]) {
+                        this[key] = event_viewModel_modifier_1.EventViewModelModifier.modify(obj[key], true, false, true, jit_constant_1.JITConstant.defaultCommandParamName);
+                    }
+                }
+                else if (key == "previewReadonly" || key == "previewVisible" || key == "previewEnableMulti") {
+                    this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], true, this.externalComponentNameSpace);
+                }
+                else if (key == "previewDefaultRename") {
+                    this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], "", this.externalComponentNameSpace);
+                }
+                else if (key == "uploadDisabled") {
+                    this[key] = toolhepler_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
+                }
+                else if (key == "fieldIdKey") {
+                    if (obj[key]) {
+                        this.fieldIdKey = toolhepler_1.ToolHelper.createBinding(obj[key], "", this.externalComponentNameSpace);
+                        if (this.fieldIdKey.bindingPath) {
+                            this.fieldIdKey.value = this.fieldIdKey.bindingPath;
+                        }
+                    }
+                }
+                else if (key == "fileNameKey") {
+                    if (obj[key]) {
+                        this.fileNameKey = toolhepler_1.ToolHelper.createBinding(obj[key], "", this.externalComponentNameSpace);
+                        if (this.fileNameKey.bindingPath) {
+                            this.fileNameKey.value = this.fileNameKey.bindingPath;
+                        }
+                    }
+                }
+                else {
+                    this[key] = obj[key];
+                }
+            }
+        });
+        if (!this.uploadVisible) {
+            this.uploadVisible = toolhepler_1.ToolHelper.createBinding(null, true, this.externalComponentNameSpace);
+        }
+        if (!this.uploadDisabled) {
+            this.uploadDisabled = toolhepler_1.ToolHelper.createBinding(null, false, this.externalComponentNameSpace);
+        }
+        this.extendServerConfig = {
+            rootId: this.rootId,
+            formId: this.formId ? this.formId.value : ""
+        };
+        if (this.uploadOptions && this.uploadOptions.hasOwnProperty("allowedContentTypes") &&
+            (toolhepler_1.ToolHelper.isNullOrUndefined(this.uploadOptions.allowedContentTypes) || toolhepler_1.ToolHelper.isArray(this.uploadOptions.allowedContentTypes, false) == false)) {
+            delete this.uploadOptions["allowedContentTypes"];
+        }
+        if (this.enableUploadedCount) {
+            const viewModelBindTo = this.viewModel.bindTo;
+            if (viewModelBindTo) {
+                const arrBindTo = viewModelBindTo.split("/");
+                let bindToString = "";
+                const filterArrBindTo = arrBindTo.filter(t => !toolhepler_1.ToolHelper.isNullOrUndefinedOrEmpty(t)) || [];
+                filterArrBindTo.forEach((item, index) => {
+                    bindToString += `'${item}'`;
+                    if (index < filterArrBindTo.length - 1) {
+                        bindToString += ",";
+                    }
+                });
+                this.uploadedCount = `this.viewModel.bindingData && this.viewModel.bindingData.getValue([${bindToString}]).length`;
+            }
+        }
+        if (!this.previewEnableRename) {
+            this.previewDefaultRename = null;
+        }
+        this.serializedExtendServerConfig = this.generateExtendServerConfig();
+    }
+    generateExtendServerConfig() {
+        let generateString = "{";
+        if (this.rootId) {
+            generateString += `'rootId': '${this.rootId}'`;
+        }
+        if (this.formId && this.formId.value) {
+            if (this.rootId) {
+                generateString += `,`;
+            }
+            generateString += `'formId': ${toolhepler_1.ToolHelper.replaceQuoteToSingle(this.formId.value)} `;
+        }
+        generateString += `}`;
+        return generateString;
+    }
+}
+exports.FarrisFileUploadAndPreview = FarrisFileUploadAndPreview;
+//# sourceMappingURL=farris-file-upload-preview.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"farris-file-upload-preview.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.ts"],"names":[],"mappings":"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"}

package/lib/domstructure/ui/farris-fileupload-preview/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./farris-file-upload-preview"), exports);
+//# sourceMappingURL=index.js.map

package/lib/domstructure/ui/farris-fileupload-preview/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/farris-fileupload-preview/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA6C"}

package/lib/domstructure/ui/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./multi-select"), exports);
 __exportStar(require("./view-change"), exports);
 __exportStar(require("./farris-avatar"), exports);
 __exportStar(require("./list-filter"), exports);
+__exportStar(require("./light-listfilter"), exports);
 __exportStar(require("./farris-calendar"), exports);
 __exportStar(require("./farris-scrollspy"), exports);
 __exportStar(require("./farris-dynamic-control-group"), exports);
@@ -45,4 +46,5 @@ __exportStar(require("./farris-ui-footer"), exports);
 __exportStar(require("./header"), exports);
 __exportStar(require("./modal-footer"), exports);
 __exportStar(require("./approve-logs"), exports);
+__exportStar(require("./farris-fileupload-preview"), exports);
 //# sourceMappingURL=index.js.map

package/lib/domstructure/ui/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domstructure/ui/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA2B;AAC3B,2CAAyB;AACzB,8CAA4B;AAC5B,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,wCAAsB;AACtB,sDAAoC;AACpC,4CAA0B;AAC1B,0CAAwB;AACxB,uDAAqC;AACrC,gDAA8B;AAC9B,2CAAyB;AACzB,+CAA6B;AAC7B,6CAA2B;AAC3B,mDAAiC;AACjC,6CAA2B;AAC3B,iDAA+B;AAC/B,gDAA8B;AAC9B,kDAAgC;AAChC,gDAA8B;AAC9B,oDAAkC;AAClC,qDAAmC;AACnC,iEAA+C;AAC/C,wDAAsC;AACtC,uDAAqC;AACrC,gDAA8B;AAC9B,+CAA6B;AAC7B,4CAA0B;AAC1B,yCAAuB;AACvB,4CAA0B;AAC1B,qDAAmC;AACnC,2CAAyB;AACzB,iDAA+B;AAC/B,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domstructure/ui/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA2B;AAC3B,2CAAyB;AACzB,8CAA4B;AAC5B,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,wCAAsB;AACtB,sDAAoC;AACpC,4CAA0B;AAC1B,0CAAwB;AACxB,uDAAqC;AACrC,gDAA8B;AAC9B,2CAAyB;AACzB,+CAA6B;AAC7B,6CAA2B;AAC3B,mDAAiC;AACjC,6CAA2B;AAC3B,iDAA+B;AAC/B,gDAA8B;AAC9B,kDAAgC;AAChC,gDAA8B;AAC9B,qDAAmC;AACnC,oDAAkC;AAClC,qDAAmC;AACnC,iEAA+C;AAC/C,wDAAsC;AACtC,uDAAqC;AACrC,gDAA8B;AAC9B,+CAA6B;AAC7B,4CAA0B;AAC1B,yCAAuB;AACvB,4CAA0B;AAC1B,qDAAmC;AACnC,2CAAyB;AACzB,iDAA+B;AAC/B,iDAA+B;AAC/B,8DAA4C"}

package/lib/domstructure/ui/light-listfilter/farris-light-listfilter.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FarrisLightListFilter = void 0;
+const utility_1 = require("../../../utility");
+const common_1 = require("../common");
+class FarrisLightListFilter extends common_1.BaseComponent {
+    constructor(param) {
+        super(param);
+        this.type = "FarrisLightListFilter";
+        let obj;
+        if (typeof param === 'string') {
+            obj = utility_1.ToolHelper.convertToJsonOrDefault(param);
+        }
+        else {
+            obj = param;
+        }
+        if (!obj) {
+            return;
+        }
+        const keys = 'filterList,showReminder,showExtendInSidebar,disable,binding,query,searchChange';
+        Object.keys(obj).forEach(key => {
+            if (keys.includes(key)) {
+                if (key == "query" || key == "searchChange") {
+                    if (obj[key]) {
+                        this[key] = utility_1.EventViewModelModifier.modify(obj[key], true, true, true, utility_1.JITConstant.defaultCommandParamName);
+                    }
+                }
+                else if (key == "filterList") {
+                    this.filterList = [];
+                    if (utility_1.ToolHelper.isArray(obj[key], false)) {
+                        obj[key].forEach((item) => {
+                            this.filterList.push(item);
+                        });
+                    }
+                }
+                else if (key == "binding") {
+                    if (obj[key]) {
+                        this.binding = utility_1.ToolHelper.createBindingWithoutDefaultValue(obj[key], this.externalComponentNameSpace);
+                    }
+                }
+                else if (key === "showReminder" || key === "showExtendInSidebar") {
+                    this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace);
+                }
+                else if (key == "disable") {
+                    let disableValue = obj[key];
+                    if (utility_1.ToolHelper.isNullOrUndefined(disableValue)) {
+                        disableValue = false;
+                    }
+                    this.disable = utility_1.ToolHelper.createBindingWithoutDefaultValue(disableValue, this.externalComponentNameSpace);
+                }
+                else {
+                    this[key] = obj[key];
+                }
+            }
+        });
+        if (utility_1.ToolHelper.isArray(this.filterList, false)) {
+            this.filterListLang = "filterList" + utility_1.ToolHelper.replaceHengXianAndDotToXiaHuaXian(utility_1.ToolHelper.replaceSpecialCharacter(this.id));
+        }
+    }
+    toJSON() {
+        const result = {
+            "id": this.id,
+            "type": "FarrisLightListFilter",
+            "appearance": this.appearance,
+            "filterList": this.filterList,
+            "filterListJsonString": this.filterListJsonString,
+            "showReminder": this.showReminder,
+            "showExtendInSidebar": this.showExtendInSidebar,
+            "query": this.query,
+            "disable": this.disable
+        };
+        return result;
+    }
+    toString() {
+        return JSON.stringify(this.toJSON());
+    }
+}
+exports.FarrisLightListFilter = FarrisLightListFilter;
+//# sourceMappingURL=farris-light-listfilter.js.map

package/lib/domstructure/ui/light-listfilter/farris-light-listfilter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"farris-light-listfilter.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/light-listfilter/farris-light-listfilter.ts"],"names":[],"mappings":"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"}

package/lib/domstructure/ui/light-listfilter/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./farris-light-listfilter"), exports);
+//# sourceMappingURL=index.js.map

package/lib/domstructure/ui/light-listfilter/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/light-listfilter/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAA0C"}

package/lib/mobileapp/vue/code-generator/devkit-manager/app-expression-manager.js

@@ -6,9 +6,9 @@ const vue_app_expression_1 = require("../file-generator/app-generator/vue-app-ex
 class AppExpressionManager {
     static generate(generateParam) {
         const context = new file_generator_context_1.FileGeneratorContext();
-        context.basePath = generateParam.publishPath + "/" + "src/apps/" + generateParam.frm_code;
-        context.fileName = "expression.json";
-        context.externalParameter = generateParam.value.ui;
+        context.basePath = generateParam.publishPath + "/src/assets/" + generateParam.frm_code + '/expressions';
+        context.fileName = generateParam.frm_code + ".expression.json";
+        context.externalParameter = generateParam.value;
         const appExpressionGenerator = new vue_app_expression_1.VueAppExpressionGenerator();
         appExpressionGenerator.generate(context);
     }

package/lib/mobileapp/vue/code-generator/devkit-manager/app-expression-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-expression-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-expression-manager.ts"],"names":[],"mappings":";;;AAAA,qFAAgF;AAKhF,2FAA+F;AAE/F,MAAa,oBAAoB;IAC7B,MAAM,CAAC,QAAQ,CAAC,aAGf;QACG,MAAM,OAAO,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QAGjE,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC,WAAW,GAAG,GAAG,GAAG,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC;QAC1F,OAAO,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACrC,OAAO,CAAC,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAEnD,MAAM,sBAAsB,GAA8B,IAAI,8CAAyB,EAAE,CAAC;QAC1F,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;CACJ;AAfD,oDAeC"}
+{"version":3,"file":"app-expression-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-expression-manager.ts"],"names":[],"mappings":";;;AAAA,qFAAgF;AAKhF,2FAA+F;AAE/F,MAAa,oBAAoB;IAC7B,MAAM,CAAC,QAAQ,CAAC,aAGf;QACG,MAAM,OAAO,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QAGjE,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC,WAAW,GAAE,cAAc,GAAG,aAAa,CAAC,QAAQ,GAAG,cAAc,CAAC;QACvG,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,GAAG,kBAAkB,CAAC;QAC/D,OAAO,CAAC,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC;QAEhD,MAAM,sBAAsB,GAA8B,IAAI,8CAAyB,EAAE,CAAC;QAC1F,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;CACJ;AAfD,oDAeC"}

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

@@ -48,6 +48,7 @@ class AppIndexVueManager {
         indexVueParameter.fileterString = appFilterResponse.fileContent;
         indexVueParameter.formCode = generateParam.frm_code;
         indexVueParameter.imports = devkitValue.module.imports;
+        indexVueParameter.metaDataConfig = generateParam.metaDataConfig;
         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

@@ -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,mGAA4F;AAC5F,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;QAEvD,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;AAnCD,gDAmCC"}
+{"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,mGAA4F;AAC5F,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;QAEhE,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;AApCD,gDAoCC"}

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.js

@@ -4,112 +4,63 @@ exports.VueAppExpressionGenerator = void 0;
 const abstract_file_generator_1 = require("../abstract-file-generator");
 const file_generator_response_1 = require("../file-generator-response");
 class VueAppExpressionGenerator extends abstract_file_generator_1.AbstractFileGenerator {
+    constructor() {
+        super(...arguments);
+        this.fieldMap = new Map();
+    }
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         let generateString = '[';
-        this.initDomconstructor(context.externalParameter);
-        const inputNames = ['TextBox', 'LookupEdit', 'DateBox', 'TimePicker', 'NumericBox', 'SwitchField', 'EnumField', 'MultiTextBox', 'RadioGroup', 'CheckGroup', 'CalendarInput', 'RichTextEditor'];
-        const inputs = this.getNodesByTypes(inputNames);
-        inputs.forEach((item, index) => {
+        this.initFieldMap(context.externalParameter);
+        const expressions = this.getExpressions(context.externalParameter.ui);
+        expressions.forEach((item, index) => {
             if (index !== 0) {
                 generateString += ',';
             }
-            const expressions = item.expressions
-                ? item.expressions.map((el) => {
+            const field = this.fieldMap.get(item.fieldId);
+            const path = field.bindTo === '/' ? field.binding : field.bindTo + '/' + field.binding;
+            const viewModelId = item.viewModelId ? item.viewModelId : '';
+            const _expressions = item.expression
+                ? item.expression.map((el) => {
+                    var _a;
+                    const { id, type, value, message, messageType } = el;
                     return {
-                        id: item.binding.field + el.type,
-                        type: el.type,
-                        value: el.expr,
-                        message: '',
-                        messageType: '',
+                        id,
+                        type,
+                        value: value && ((_a = JSON.parse(value)) === null || _a === void 0 ? void 0 : _a.expr) ? JSON.parse(value).expr : '',
+                        message,
+                        messageType,
                     };
                 })
                 : [];
             generateString += `
 {
-    "path": "${item.binding.path}",
+    "path": "${path.replace(/\./g, '/')}",
     "ns": "",
     "type": "Field",
-    "expressions": ${JSON.stringify(expressions)}
+    "viewModelId":"${viewModelId}",
+    "expressions": ${JSON.stringify(_expressions)}
 }`;
         });
         generateString += ']';
         this.createFile(context.basePath, context.fileName, generateString);
+        this.createFile(context.basePath, 'form.manifest.json', `{"expressions":[{"path":"./${context.fileName}","ns":""}]}`);
         return response;
     }
-    initDomconstructor(dom) {
-        this.dom = dom;
-        this.wrappedNodesDic = new Map();
-        this.wrappedComponentRefNodesDic = new Map();
-        this.buildNodesDic();
-    }
-    buildNodesDic() {
-        const componentNodes = this.getComponents();
-        componentNodes.forEach((componentNode) => {
-            this.flatNode(componentNode, null, componentNode);
-        });
-        this.wrappedComponentRefNodesDic.forEach((wrappedComponentRefNode) => {
-            const componentId = wrappedComponentRefNode.node.component;
-            const wrappedComponentNode = this.wrappedNodesDic.get(componentId);
-            if (wrappedComponentNode) {
-                wrappedComponentNode.wrappedParentNode = wrappedComponentRefNode;
-            }
-        });
-    }
-    flatNode(node, parentNode, componentNode) {
-        if (this.wrappedNodesDic.has(node.id)) {
-            throw new Error('存在id重复的节点，请检查');
-        }
-        const wrappedComponentNode = componentNode ? this.wrappedNodesDic.get(componentNode.id) : null;
-        const wrappedParentNode = parentNode ? this.wrappedNodesDic.get(parentNode.id) : null;
-        const wrappedNode = {
-            wrappedComponentNode,
-            wrappedParentNode,
-            node,
-        };
-        this.wrappedNodesDic.set(node.id, wrappedNode);
-        if (node.type === 'ComponentRef') {
-            this.wrappedComponentRefNodesDic.set(node.id, wrappedNode);
-        }
-        if (node.contents && node.contents.length) {
-            node.contents.forEach((childNode) => {
-                this.flatNode(childNode, node, componentNode);
+    initFieldMap(module) {
+        const viewmodels = (module === null || module === void 0 ? void 0 : module.viewmodels) ? module.viewmodels : [];
+        viewmodels.forEach((viewmodel) => {
+            const bindTo = viewmodel.bindTo;
+            const controls = viewmodel.form.controls;
+            controls.forEach((control) => {
+                const { field } = control;
+                this.fieldMap.set(field.id, Object.assign(Object.assign({}, field), { bindTo }));
             });
-        }
-    }
-    getComponents() {
-        const components = this.dom.module.components;
-        return components;
-    }
-    getNodesByType(type, component) {
-        const wrappedNodes = this.getWrappedNodesByType(type, component);
-        const nodes = wrappedNodes.map((wrappedNode) => {
-            return wrappedNode.node;
-        });
-        return nodes;
-    }
-    getNodesByTypes(types) {
-        let result = [];
-        types.forEach(type => {
-            const nodes = this.getNodesByType(type).filter(node => node.expressions);
-            result = [...result, ...nodes];
         });
-        return result;
     }
-    getWrappedNodesByType(type, component) {
-        const targetWrappedNodes = [];
-        this.wrappedNodesDic.forEach((wrappedNode, nodeId) => {
-            if (component &&
-                wrappedNode.wrappedComponentNode &&
-                wrappedNode.wrappedComponentNode.node !== component) {
-                return;
-            }
-            if (wrappedNode.node.type !== type) {
-                return;
-            }
-            targetWrappedNodes.push(wrappedNode);
-        });
-        return targetWrappedNodes;
+    getExpressions(dom) {
+        var _a;
+        return ((_a = dom.module) === null || _a === void 0 ? void 0 : _a.expressions) ? dom.module.expressions : [];
     }
 }
 exports.VueAppExpressionGenerator = VueAppExpressionGenerator;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-app-expression.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vue-app-expression.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.ts"],"names":[],"mappings":"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"}