@farris/jit-engine 1.3.299 → 1.3.301

package/README.md

@@ -1,4 +1,8 @@
-1.3.299
+1.3.301
+
+    移动页面标题、tab过滤条件修复
+
+1.3.300
 
     流程版本更新
 

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

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -132,17 +132,18 @@ class VueViewModelsCreator {
             if (item.component && item.component.template) {
                 if (toolhepler_1.ToolHelper.isArray(item.component.template, true)) {
                     item.component.template.forEach((component) => {
+                        this.addUiState(component, options);
                         if (component.form) {
                             this.handleValidProps(component, component.form);
                         }
                     });
                 }
                 else {
+                    this.addUiState(item, options);
                     if (item.form) {
                         this.handleValidProps(item.component.template, item.form);
                     }
                 }
-                this.addcontrolStateExtend(item, options);
             }
             if (!toolhepler_1.ToolHelper.isNullOrUndefinedOrEmpty(item.allowEmpty) || !toolhepler_1.ToolHelper.isNullOrUndefinedOrEmpty(item.entityDisplayName)) {
                 const relateEntity = vue_entities_creator_1.VueEntitiesCreator.getSingleInstance().getEntityInfoByBindto(viewModelParameter.entity, item.bindTo);
@@ -154,6 +155,11 @@ class VueViewModelsCreator {
                 }
             }
         });
+        viewModelList.forEach((item) => {
+            if (item.component && item.component.template) {
+                this.addcontrolStateExtend(item, options);
+            }
+        });
         return viewModelList;
     }
     addUiState(item, options) {

package/lib/utility/devkit/component-parameter-collector/toolbar-collector.js

@@ -90,7 +90,7 @@ class ToolbarCollector extends abstract_component_parameter_collector_1.Abstract
                     visibleControlledByRules: element.visibleControlledByRules,
                     disableControlledByRules: element.disableControlledByRules
                 };
-                states[barItemConfig.id] = toolhepler_1.ToolHelper.createBinding(barItemConfig.disable.value, true, externalComponentNameSpace, barItemConfig.id).value;
+                states[barItemConfig.id] = toolhepler_1.ToolHelper.isNullOrUndefinedOrEmpty(barItemConfig.disable.value) ? 'false' : barItemConfig.disable.value;
                 visibleState[barItemConfig.id] = toolhepler_1.ToolHelper.createBinding(barItemConfig.visible, true, externalComponentNameSpace, barItemConfig.id).value;
                 if (element.items && element.items.length) {
                     this.collectToolbarItems(element, toolbarItem.children, events, states, visibleState, i18nResourceKeyPrefix, externalComponentNameSpace, viewModel);

package/package.json

@@ -1,56 +1,56 @@
-{
-  "name": "@farris/jit-engine",
-  "version": "1.3.299",
-  "description": "",
-  "main": "./lib/index.js",
-  "bin": {
-    "jit": "./bin/index.js"
-  },
-  "engines": {
-    "node": ">= 6.9.0",
-    "npm": ">= 3.0.0"
-  },
-  "files": [
-    "lib/",
-    "bin/",
-    "ioc.config"
-  ],
-  "scripts": {
-    "build": "npm run build-ts && npm run copy-static-assets",
-    "build-q": "npm run build-ts",
-    "test": "jest  --coverage ",
-    "watch-test": "npm run test --watchAll",
-    "build-ts": "tsc",
-    "tslint": "tslint -c tslint.json -p tsconfig.json",
-    "copy-static-assets": "ts-node copyStaticAssets.ts"
-  },
-  "keywords": [
-    "jit",
-    "engine",
-    "jit-engine"
-  ],
-  "author": "Noah",
-  "license": "ISC",
-  "dependencies": {
-    "fs-extra": "^8.1.0",
-    "lodash": "^4.17.10",
-    "prettier": "^1.18.2",
-    "pug": "^2.0.0-rc.4",
-    "typescript-ioc": "^1.2.4",
-    "yargs": "^12.0.1"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^8.1.1",
-    "@types/jest": "24.0.15",
-    "@types/lodash": "^4.14.91",
-    "@types/node": "^12.6.1",
-    "@types/prettier": "^1.18.0",
-    "@types/pug": "^2.0.4",
-    "@types/yargs": "^11.1.1",
-    "jest": "^24.8.0",
-    "ts-jest": "^24.0.2",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
-  }
-}
+{
+  "name": "@farris/jit-engine",
+  "version": "1.3.301",
+  "description": "",
+  "main": "./lib/index.js",
+  "bin": {
+    "jit": "./bin/index.js"
+  },
+  "engines": {
+    "node": ">= 6.9.0",
+    "npm": ">= 3.0.0"
+  },
+  "files": [
+    "lib/",
+    "bin/",
+    "ioc.config"
+  ],
+  "scripts": {
+    "build": "npm run build-ts && npm run copy-static-assets",
+    "build-q": "npm run build-ts",
+    "test": "jest  --coverage ",
+    "watch-test": "npm run test --watchAll",
+    "build-ts": "tsc",
+    "tslint": "tslint -c tslint.json -p tsconfig.json",
+    "copy-static-assets": "ts-node copyStaticAssets.ts"
+  },
+  "keywords": [
+    "jit",
+    "engine",
+    "jit-engine"
+  ],
+  "author": "Noah",
+  "license": "ISC",
+  "dependencies": {
+    "fs-extra": "^8.1.0",
+    "lodash": "^4.17.10",
+    "prettier": "^1.18.2",
+    "pug": "^2.0.0-rc.4",
+    "typescript-ioc": "^1.2.4",
+    "yargs": "^12.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^8.1.1",
+    "@types/jest": "24.0.15",
+    "@types/lodash": "^4.14.91",
+    "@types/node": "^12.6.1",
+    "@types/prettier": "^1.18.0",
+    "@types/pug": "^2.0.4",
+    "@types/yargs": "^11.1.1",
+    "jest": "^24.8.0",
+    "ts-jest": "^24.0.2",
+    "ts-node": "^8.3.0",
+    "tslint": "^5.18.0",
+    "typescript": "^4.3.5"
+  }
+}