@byteluck-fe/model-driven-upgrade 2.2.2-beta.9 → 2.2.3

package/dist/esm/VersionBuilder.js

@@ -19,6 +19,7 @@ function _createClass(Constructor, protoProps, staticProps) {
 }
 import { error, log } from "@byteluck-fe/model-driven-shared";
 import dataCleaner from "./upgrade";
+import { compareVersions, compare } from "compare-versions";
 function versionReplace$v(version) {
     return version.replace(/^v/, "");
 }
@@ -27,10 +28,12 @@ function versionToNumber(version) {
 }
 var versionKeys = Object.keys(dataCleaner).map(function(key) {
     return versionReplace$v(key);
-}).sort(function(a, b) {
-    return Number(a) - Number(b);
-});
+}).sort(compareVersions);
+// .sort((a, b) => Number(a) - Number(b))
 var nowVersion = versionKeys[versionKeys.length - 1];
+// const result = compareVersions('2.10', '3.1')
+// const sort = versionKeys.sort(compareVersions)
+// console.log('compareVersions', result, sort)
 export var VersionBuilder = /*#__PURE__*/ function() {
     "use strict";
     function VersionBuilder(schemaVersion) {
@@ -38,7 +41,8 @@ export var VersionBuilder = /*#__PURE__*/ function() {
         _classCallCheck(this, VersionBuilder);
         this.schemaVersion = schemaVersion;
         this.toVersion = version;
-        if (versionToNumber(version) > versionToNumber(nowVersion)) {
+        // if (versionToNumber(version) > versionToNumber(nowVersion)) {
+        if (compare(version, nowVersion, ">")) {
             error("Version Builder: The specified ".concat(version, " is an undefined version, and the current latest version is ").concat(nowVersion));
         } else if (!versionKeys.includes(versionReplace$v(version)) || !versionKeys.includes(versionReplace$v(schemaVersion))) {
             error("Version Builder: Please give me a valid version number, The valid version is: ".concat(versionKeys.join(","), ", But give me a ").concat(schemaVersion));
@@ -47,7 +51,8 @@ export var VersionBuilder = /*#__PURE__*/ function() {
     var _proto = VersionBuilder.prototype;
     _proto.dataCleaner = function dataCleaner1(schema, payload) {
         var _this = this;
-        if (this._version === this._schemaVersion) {
+        // if (this._version === this._schemaVersion) {
+        if (compare(this.toVersion, this.schemaVersion, "=")) {
             return schema;
         }
         var result = this.callDataCleanerKeys.reduce(function(schema, currentVersion, index, arr) {
@@ -73,7 +78,8 @@ export var VersionBuilder = /*#__PURE__*/ function() {
             get: function get() {
                 var _this = this;
                 return versionKeys.filter(function(item) {
-                    return Number(item) >= _this._schemaVersion && Number(item) < _this._version;
+                    return(// Number(item) >= this._schemaVersion && Number(item) < this._version
+                    compare(item, _this.schemaVersion, ">=") && compare(item, _this.toVersion, "<"));
                 });
             }
         },
@@ -85,21 +91,15 @@ export var VersionBuilder = /*#__PURE__*/ function() {
                 });
             }
         },
-        {
-            key: "_version",
-            get: function get() {
-                return versionToNumber(this.toVersion);
-            }
-        },
-        {
-            key: "_schemaVersion",
-            get: function get() {
-                return versionToNumber(this.schemaVersion);
-            }
-        },
         {
             key: "version",
-            get: /*
+            get: // private get _version() {
+            //   return versionToNumber(this.toVersion)
+            // }
+            // private get _schemaVersion() {
+            //   return versionToNumber(this.schemaVersion)
+            // }
+            /*
    * 最新版本号
    * */ function get() {
                 return nowVersion;

package/dist/esm/upgrade/index.js

@@ -8,7 +8,8 @@ import { dataCleaner as dataCleanerV2_5toV2_6 } from "./v2_5";
 import { dataCleaner as dataCleanerV2_6toV2_7 } from "./v2_6";
 import { dataCleaner as dataCleanerV2_7toV2_8 } from "./v2_7";
 import { dataCleaner as dataCleanerV2_8toV2_9 } from "./v2_8";
-import { dataCleaner as dataCleanerV2_9toV3_0 } from "./v2_9";
+import { dataCleaner as dataCleanerV2_9toV2_10 } from "./v2_9";
+import { dataCleaner as dataCleanerV2_10toV3_0 } from "./v2_10";
 import { dataCleaner as dataCleanerV3_0toV3_1 } from "./v3_0";
 // TODO 切记复制粘贴的时候改一下from后边的路径，不然会出事儿
 // TODO 注意从2.5版本开始，没有进行驼峰转下划线了，写的时候要注意
@@ -23,7 +24,8 @@ export default {
     "v2.6": dataCleanerV2_6toV2_7,
     "v2.7": dataCleanerV2_7toV2_8,
     "v2.8": dataCleanerV2_8toV2_9,
-    "v2.9": dataCleanerV2_9toV3_0,
+    "v2.9": dataCleanerV2_9toV2_10,
+    "v2.10": dataCleanerV2_10toV3_0,
     "v3.0": dataCleanerV3_0toV3_1,
     // 每次都需要预留一个下一版本的转换函数，会使用到对应的key作为当前最新的schema version
     "v3.1": function() {}

package/dist/esm/upgrade/v2_10.js

@@ -0,0 +1,53 @@
+import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+var dataCleaner = function(schemaItems, payload) {
+    var isArray = Array.isArray(schemaItems);
+    var schemaArray = isArray ? schemaItems : [
+        schemaItems
+    ];
+    var new_schema = loop(schemaArray, function(item) {
+        return conversion(item, payload);
+    });
+    return isArray ? new_schema : new_schema[0];
+};
+function conversion(schema, payload) {
+    //兼容老数据数据填充是否开启，老数据默认开启
+    if ([
+        CONTROL_TYPE.SELECT,
+        CONTROL_TYPE.SELECT_RELATION,
+        CONTROL_TYPE.SELECT_MULTIPLE,
+        CONTROL_TYPE.RADIO,
+        CONTROL_TYPE.CHECKBOX,
+        CONTROL_TYPE.TREE,
+        CONTROL_TYPE.DEPARTMENT2,
+        CONTROL_TYPE.EMPLOYEE2,
+        CONTROL_TYPE.DEPARTMENT,
+        CONTROL_TYPE.EMPLOYEE
+    ].includes(schema.type)) {
+        if (schema.props.open_multistage_filling === undefined) {
+            schema.props.open_multistage_filling = true;
+        }
+    }
+    //兼容老数据数据填充是否开启，老数据默认开启 明细表内控件
+    if (schema.type === CONTROL_TYPE.SUBTABLE) {
+        schema.props.headers.forEach(function(item) {
+            if ([
+                CONTROL_TYPE.SELECT,
+                CONTROL_TYPE.SELECT_RELATION,
+                CONTROL_TYPE.SELECT_MULTIPLE,
+                CONTROL_TYPE.RADIO,
+                CONTROL_TYPE.CHECKBOX,
+                CONTROL_TYPE.TREE,
+                CONTROL_TYPE.DEPARTMENT2,
+                CONTROL_TYPE.EMPLOYEE2,
+                CONTROL_TYPE.DEPARTMENT,
+                CONTROL_TYPE.EMPLOYEE
+            ].includes(item.children[0].type)) {
+                if (item.children[0].props.open_multistage_filling === undefined) {
+                    item.children[0].props.open_multistage_filling = true;
+                }
+            }
+        });
+    }
+    return schema;
+}
+export { dataCleaner };

package/dist/esm/upgrade/v2_9.js

@@ -1,11 +1,11 @@
 /*
  * @Author: qiyu qiyu@byteluck.com
  * @Date: 2022-12-22 11:36:04
- * @LastEditors: SuperLucky-Q
- * @LastEditTime: 2022-12-30 14:36:45
- * @FilePath: /model-driven/packages/upgrade/src/upgrade/v2_10.ts
+ * @LastEditors: qiyu qiyu@byteluck.com
+ * @LastEditTime: 2023-03-03 13:42:29
+ * @FilePath: /model-driven/packages/upgrade/src/upgrade/v2_9.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */ import { loop } from "@byteluck-fe/model-driven-shared";
+ */ import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
 var dataCleaner = function(schemaItems, payload) {
     var isArray = Array.isArray(schemaItems);
     var schemaArray = isArray ? schemaItems : [
@@ -17,77 +17,44 @@ var dataCleaner = function(schemaItems, payload) {
     return isArray ? new_schema : new_schema[0];
 };
 function conversion(schema, payload) {
-    // if (schema.type === CONTROL_TYPE.GRID_TABLE) {
-    //   schema.props.headers.map((item: any) => {
-    //     if (item.type === CONTROL_TYPE.OPERATION_COLUMN) {
-    //       if (item.props.width_type === 'auto') {
-    //         item.props.auto_width = {
-    //           min_width: 120,
-    //           max_width: 120,
-    //           flex: 1,
-    //         }
-    //       } else if (item.props.width_type === 'px') {
-    //         item.props.auto_width = {
-    //           min_width: item.props.width,
-    //           max_width: item.props.width,
-    //           flex: 1,
-    //         }
-    //       }
-    //       item.props.width_type = 'auto'
-    //       item.children = []
-    //       delete item.props.custom
-    //       if (item.props?.check !== undefined) {
-    //         const optbtn = new OperationButton.Designer()
-    //         optbtn.props.code = 'view'
-    //         optbtn.props.icon = 'iconliulan1'
-    //         optbtn.props.command = 'view'
-    //         optbtn.props.content = item.props?.check.content
-    //         optbtn.props.priorityProcess = item.props?.check.priority_process
-    //         optbtn.props.openType = item.props?.check.open_type
-    //         optbtn.props.formKey = item.props?.check.form_key
-    //         if (item.props?.check.is_show) {
-    //           item.children.push(optbtn.toSchema())
-    //         }
-    //         delete item.props?.check
-    //       }
-    //       if (item.props?.edit !== undefined) {
-    //         const optbtn = new OperationButton.Designer()
-    //         optbtn.props.code = 'edit'
-    //         optbtn.props.icon = 'iconbianji1'
-    //         optbtn.props.command = 'edit'
-    //         optbtn.props.content = item.props?.edit.content
-    //         optbtn.props.priorityProcess = item.props?.edit.priority_process
-    //         optbtn.props.openType = item.props?.edit.open_type
-    //         optbtn.props.formKey = item.props?.edit.form_key
-    //         if (item.props?.edit.is_show) {
-    //           item.children.push(optbtn.toSchema())
-    //         }
-    //         delete item.props?.edit
-    //       }
-    //       if (item.props?.delete !== undefined) {
-    //         const optbtn = new OperationButton.Designer()
-    //         optbtn.props.code = 'delete'
-    //         optbtn.props.icon = 'iconlajitong'
-    //         optbtn.props.command = 'delete'
-    //         optbtn.props.content = item.props?.delete.content
-    //         optbtn.props.priorityProcess = item.props?.delete.priority_process
-    //         optbtn.props.openType = item.props?.delete.open_type
-    //         optbtn.props.formKey = item.props?.delete.form_key
-    //         optbtn.props.needConfirm = true
-    //         optbtn.props.confirmMessage = '确定要删除此条数据吗？'
-    //         if (item.props?.delete.is_show) {
-    //           item.children.push(optbtn.toSchema())
-    //         }
-    //         delete item.props?.delete
-    //       }
-    //     }
-    //   })
-    // }
-    // //标题组件控件兼容老数据 config 默认展示标题
-    // if (schema.type === CONTROL_TYPE.TITLE) {
-    //   schema.props.config.push(TitleConfigEnum.ShowTitle)
-    // }
-    //
+    //兼容老数据数据填充是否开启，老数据默认开启
+    if ([
+        CONTROL_TYPE.SELECT,
+        CONTROL_TYPE.SELECT_RELATION,
+        CONTROL_TYPE.SELECT_MULTIPLE,
+        CONTROL_TYPE.RADIO,
+        CONTROL_TYPE.CHECKBOX,
+        CONTROL_TYPE.TREE,
+        CONTROL_TYPE.DEPARTMENT2,
+        CONTROL_TYPE.EMPLOYEE2,
+        CONTROL_TYPE.DEPARTMENT,
+        CONTROL_TYPE.EMPLOYEE
+    ].includes(schema.type)) {
+        if (schema.props.open_multistage_filling === undefined) {
+            schema.props.open_multistage_filling = true;
+        }
+    }
+    //兼容老数据数据填充是否开启，老数据默认开启 明细表内控件
+    if (schema.type === CONTROL_TYPE.SUBTABLE) {
+        schema.props.headers.forEach(function(item) {
+            if ([
+                CONTROL_TYPE.SELECT,
+                CONTROL_TYPE.SELECT_RELATION,
+                CONTROL_TYPE.SELECT_MULTIPLE,
+                CONTROL_TYPE.RADIO,
+                CONTROL_TYPE.CHECKBOX,
+                CONTROL_TYPE.TREE,
+                CONTROL_TYPE.DEPARTMENT2,
+                CONTROL_TYPE.EMPLOYEE2,
+                CONTROL_TYPE.DEPARTMENT,
+                CONTROL_TYPE.EMPLOYEE
+            ].includes(item.children[0].type)) {
+                if (item.children[0].props.open_multistage_filling === undefined) {
+                    item.children[0].props.open_multistage_filling = true;
+                }
+            }
+        });
+    }
     return schema;
 }
 export { dataCleaner };

package/dist/esm/upgrade/v3_0.js

@@ -1,8 +1,8 @@
 /*
  * @Author: qiyu qiyu@byteluck.com
  * @Date: 2022-12-22 11:36:04
- * @LastEditors: SuperLucky-Q
- * @LastEditTime: 2022-12-30 16:27:12
+ * @LastEditors: qiyu qiyu@byteluck.com
+ * @LastEditTime: 2023-03-03 13:42:45
  * @FilePath: /model-driven/packages/upgrade/src/upgrade/v2_10.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */ import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
@@ -103,6 +103,44 @@ function conversion(schema, payload) {
             }
         });
     }
+    //兼容老数据数据填充是否开启，老数据默认开启
+    if ([
+        CONTROL_TYPE.SELECT,
+        CONTROL_TYPE.SELECT_RELATION,
+        CONTROL_TYPE.SELECT_MULTIPLE,
+        CONTROL_TYPE.RADIO,
+        CONTROL_TYPE.CHECKBOX,
+        CONTROL_TYPE.TREE,
+        CONTROL_TYPE.DEPARTMENT2,
+        CONTROL_TYPE.EMPLOYEE2,
+        CONTROL_TYPE.DEPARTMENT,
+        CONTROL_TYPE.EMPLOYEE
+    ].includes(schema.type)) {
+        if (schema.props.open_multistage_filling === undefined) {
+            schema.props.open_multistage_filling = true;
+        }
+    }
+    //兼容老数据数据填充是否开启，老数据默认开启 明细表内控件
+    if (schema.type === CONTROL_TYPE.SUBTABLE) {
+        schema.props.headers.forEach(function(item) {
+            if ([
+                CONTROL_TYPE.SELECT,
+                CONTROL_TYPE.SELECT_RELATION,
+                CONTROL_TYPE.SELECT_MULTIPLE,
+                CONTROL_TYPE.RADIO,
+                CONTROL_TYPE.CHECKBOX,
+                CONTROL_TYPE.TREE,
+                CONTROL_TYPE.DEPARTMENT2,
+                CONTROL_TYPE.EMPLOYEE2,
+                CONTROL_TYPE.DEPARTMENT,
+                CONTROL_TYPE.EMPLOYEE
+            ].includes(item.children[0].type)) {
+                if (item.children[0].props.open_multistage_filling === undefined) {
+                    item.children[0].props.open_multistage_filling = true;
+                }
+            }
+        });
+    }
     return schema;
 }
 export { dataCleaner };