@byteluck-fe/model-driven-upgrade 2.8.1-beta.13 → 2.8.1-beta.15

package/dist/esm/VersionBuilder.js

@@ -1,4 +1,4 @@
-function _class_call_check(instance, Constructor) {
+function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -12,12 +12,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class(Constructor, protoProps, staticProps) {
+function _createClass(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _define_property(obj, key, value) {
+function _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -50,9 +50,9 @@ export var VersionBuilder = /*#__PURE__*/ function() {
     "use strict";
     function VersionBuilder(schemaVersion) {
         var version = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : nowVersion;
-        _class_call_check(this, VersionBuilder);
-        _define_property(this, "toVersion", void 0);
-        _define_property(this, "schemaVersion", void 0);
+        _classCallCheck(this, VersionBuilder);
+        _defineProperty(this, "toVersion", void 0);
+        _defineProperty(this, "schemaVersion", void 0);
         this.schemaVersion = schemaVersion;
         this.toVersion = version;
         // if (versionToNumber(version) > versionToNumber(nowVersion)) {
@@ -62,7 +62,7 @@ export var VersionBuilder = /*#__PURE__*/ function() {
             error("Version Builder: Please give me a valid version number, The valid version is: ".concat(versionKeys.join(","), ", But give me a ").concat(schemaVersion));
         }
     }
-    _create_class(VersionBuilder, [
+    _createClass(VersionBuilder, [
         {
             key: "dataCleaner",
             value: function dataCleaner1(schema, payload) {

package/dist/esm/upgrade/index.js

@@ -13,6 +13,7 @@ import { dataCleaner as dataCleanerV2_10toV3_0 } from "./v2_10";
 import { dataCleaner as dataCleanerV3_0toV3_1 } from "./v3_0";
 import { dataCleaner as dataCleanerV3_1toV3_2 } from "./v3_1";
 import { dataCleaner as dataCleanerV3_1toV3_3 } from "./v3_2";
+import { dataCleaner as dataCleanerV3_3toV3_4 } from "./v3_3";
 // TODO 切记复制粘贴的时候改一下from后边的路径，不然会出事儿
 // TODO 注意从2.5版本开始，没有进行驼峰转下划线了，写的时候要注意
 export default {
@@ -31,6 +32,7 @@ export default {
     "v3.0": dataCleanerV3_0toV3_1,
     "v3.1": dataCleanerV3_1toV3_2,
     "v3.2": dataCleanerV3_1toV3_3,
+    "v3.3": dataCleanerV3_3toV3_4,
     // 每次都需要预留一个下一版本的转换函数，会使用到对应的key作为当前最新的schema version
-    "v3.3": function() {}
+    "v3.4": function() {}
 };

package/dist/esm/upgrade/v1_0.js

@@ -1,18 +1,18 @@
-function _array_like_to_array(arr, len) {
+function _arrayLikeToArray(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes(arr) {
+function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
 }
-function _iterable_to_array(iter) {
+function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterable_to_array_limit(arr, i) {
+function _iterableToArrayLimit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -36,25 +36,25 @@ function _iterable_to_array_limit(arr, i) {
     }
     return _arr;
 }
-function _non_iterable_rest() {
+function _nonIterableRest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _non_iterable_spread() {
+function _nonIterableSpread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _sliced_to_array(arr, i) {
-    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
-function _unsupported_iterable_to_array(o, minLen) {
+function _unsupportedIterableToArray(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 import { loop, toNumberOrEmpty, isLanguageObject, camelizeKeys, decamelizeKeys, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
 import { DataSourceBind } from "@byteluck-fe/model-driven-core";
@@ -419,7 +419,7 @@ function conversionLayoutControl(schemArray) {
         if (!(item && item.children)) return;
         var controlArray = item.children;
         for(var i = 0; i < controlArray.length; i++){
-            var _controlArray_i_children, _controlArray_i;
+            var _controlArray_i, _controlArray_i_children;
             var control = controlArray[i];
             var child = (_controlArray_i = controlArray[i]) === null || _controlArray_i === void 0 ? void 0 : (_controlArray_i_children = _controlArray_i.children) === null || _controlArray_i_children === void 0 ? void 0 : _controlArray_i_children[0];
             if (control.type === "grid-row" && child && [
@@ -443,7 +443,7 @@ function conversionListPage(controlArray, payload) {
     }
     // children = search + toolbox + table
     var listPageProps = listPage.props, children = listPage.children;
-    var _children = _sliced_to_array(children, 3), search = _children[0], toolbox = _children[1], table = _children[2];
+    var _children = _slicedToArray(children, 3), search = _children[0], toolbox = _children[1], table = _children[2];
     conversionSearch(search);
     table.props.is_fixed_header = listPageProps === null || listPageProps === void 0 ? void 0 : (_listPageProps_source_config = listPageProps.source_config) === null || _listPageProps_source_config === void 0 ? void 0 : _listPageProps_source_config.is_fixed_header;
     // table.props.datasource_bind = new DataSourceBind({
@@ -488,7 +488,7 @@ function conversionSearch(searchControl) {
             item.placeholderEnd = placeholder;
         }
         if (item.type === "date-pick") {
-            var _item_dateType_replace, _item_dateType;
+            var _item_dateType, _item_dateType_replace;
             item.type = "search-date-range";
             item.placeholderStart = placeholder;
             item.placeholderEnd = placeholder;
@@ -631,7 +631,7 @@ function conversionControlEvents(control, controlEvents) {
         if (!controlEvents[control.id][eventKey]) {
             controlEvents[control.id][eventKey] = [];
         }
-        (_controlEvents_control_id_eventKey = controlEvents[control.id][eventKey]).push.apply(_controlEvents_control_id_eventKey, _to_consumable_array(control.props.events[eventKey].map(function(item) {
+        (_controlEvents_control_id_eventKey = controlEvents[control.id][eventKey]).push.apply(_controlEvents_control_id_eventKey, _toConsumableArray(control.props.events[eventKey].map(function(item) {
             return item.name;
         })));
     });
@@ -641,7 +641,7 @@ function conversionControlEvents(control, controlEvents) {
         if (!controlEvents[control.id].on_change) {
             controlEvents[control.id].on_change = [];
         }
-        (_controlEvents_control_id_on_change = controlEvents[control.id].on_change).push.apply(_controlEvents_control_id_on_change, _to_consumable_array(controlEvents[control.id].on_blur));
+        (_controlEvents_control_id_on_change = controlEvents[control.id].on_change).push.apply(_controlEvents_control_id_on_change, _toConsumableArray(controlEvents[control.id].on_blur));
     }
 }
 export { dataCleaner };

package/dist/esm/upgrade/v2_6.js

@@ -1,4 +1,4 @@
-function _define_property(obj, key, value) {
+function _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -29,7 +29,7 @@ function setFieldTypeToDataBind(DataBind, fieldType) {
 }
 function conversion(schema, payload) {
     var _obj;
-    var fieldTypeMap = (_obj = {}, _define_property(_obj, CONTROL_TYPE.TITLE, FieldTypes.AUTO_NUMBER), _define_property(_obj, CONTROL_TYPE.ADDRESS, FieldTypes.ADDRESS), _define_property(_obj, CONTROL_TYPE.ATTACHMENT, FieldTypes.FILE), _define_property(_obj, CONTROL_TYPE.AUTO_NUMBER, FieldTypes.AUTO_NUMBER), _define_property(_obj, CONTROL_TYPE.CHECKBOX, FieldTypes.ARRAY), _define_property(_obj, CONTROL_TYPE.DATE_PICKER, FieldTypes.TIMESTAMP), _define_property(_obj, CONTROL_TYPE.DEPARTMENT, FieldTypes.DEPARTMENTS), _define_property(_obj, CONTROL_TYPE.DEPARTMENT2, FieldTypes.DEPARTMENTS), _define_property(_obj, CONTROL_TYPE.EMPLOYEE, FieldTypes.EMPLOYEES), _define_property(_obj, CONTROL_TYPE.EMPLOYEE2, FieldTypes.EMPLOYEES), _define_property(_obj, CONTROL_TYPE.IMAGE, FieldTypes.IMAGE), _define_property(_obj, CONTROL_TYPE.INPUT, FieldTypes.VARCHAR), _define_property(_obj, CONTROL_TYPE.NUMBER, FieldTypes.DECIMAL), _define_property(_obj, CONTROL_TYPE.RADIO, FieldTypes.VARCHAR), _define_property(_obj, CONTROL_TYPE.RICH_TEXT, FieldTypes.TEXT), _define_property(_obj, CONTROL_TYPE.SCORE, FieldTypes.DECIMAL), _define_property(_obj, CONTROL_TYPE.SELECT, FieldTypes.VARCHAR), _define_property(_obj, CONTROL_TYPE.SELECT_MULTIPLE, FieldTypes.ARRAY), _define_property(_obj, CONTROL_TYPE.SELECT_RELATION, FieldTypes.VARCHAR), _define_property(_obj, CONTROL_TYPE.TEXTAREA, FieldTypes.TEXT), _define_property(_obj, CONTROL_TYPE.TREE, FieldTypes.ARRAY), _define_property(_obj, CONTROL_TYPE.SEARCH_DATE_RANGE, FieldTypes.ARRAY), _define_property(_obj, CONTROL_TYPE.SEARCH_INPUT, FieldTypes.VARCHAR), _define_property(_obj, CONTROL_TYPE.SEARCH_NUMBER_RANGE, FieldTypes.ARRAY), _obj);
+    var fieldTypeMap = (_obj = {}, _defineProperty(_obj, CONTROL_TYPE.TITLE, FieldTypes.AUTO_NUMBER), _defineProperty(_obj, CONTROL_TYPE.ADDRESS, FieldTypes.ADDRESS), _defineProperty(_obj, CONTROL_TYPE.ATTACHMENT, FieldTypes.FILE), _defineProperty(_obj, CONTROL_TYPE.AUTO_NUMBER, FieldTypes.AUTO_NUMBER), _defineProperty(_obj, CONTROL_TYPE.CHECKBOX, FieldTypes.ARRAY), _defineProperty(_obj, CONTROL_TYPE.DATE_PICKER, FieldTypes.TIMESTAMP), _defineProperty(_obj, CONTROL_TYPE.DEPARTMENT, FieldTypes.DEPARTMENTS), _defineProperty(_obj, CONTROL_TYPE.DEPARTMENT2, FieldTypes.DEPARTMENTS), _defineProperty(_obj, CONTROL_TYPE.EMPLOYEE, FieldTypes.EMPLOYEES), _defineProperty(_obj, CONTROL_TYPE.EMPLOYEE2, FieldTypes.EMPLOYEES), _defineProperty(_obj, CONTROL_TYPE.IMAGE, FieldTypes.IMAGE), _defineProperty(_obj, CONTROL_TYPE.INPUT, FieldTypes.VARCHAR), _defineProperty(_obj, CONTROL_TYPE.NUMBER, FieldTypes.DECIMAL), _defineProperty(_obj, CONTROL_TYPE.RADIO, FieldTypes.VARCHAR), _defineProperty(_obj, CONTROL_TYPE.RICH_TEXT, FieldTypes.TEXT), _defineProperty(_obj, CONTROL_TYPE.SCORE, FieldTypes.DECIMAL), _defineProperty(_obj, CONTROL_TYPE.SELECT, FieldTypes.VARCHAR), _defineProperty(_obj, CONTROL_TYPE.SELECT_MULTIPLE, FieldTypes.ARRAY), _defineProperty(_obj, CONTROL_TYPE.SELECT_RELATION, FieldTypes.VARCHAR), _defineProperty(_obj, CONTROL_TYPE.TEXTAREA, FieldTypes.TEXT), _defineProperty(_obj, CONTROL_TYPE.TREE, FieldTypes.ARRAY), _defineProperty(_obj, CONTROL_TYPE.SEARCH_DATE_RANGE, FieldTypes.ARRAY), _defineProperty(_obj, CONTROL_TYPE.SEARCH_INPUT, FieldTypes.VARCHAR), _defineProperty(_obj, CONTROL_TYPE.SEARCH_NUMBER_RANGE, FieldTypes.ARRAY), _obj);
     if (fieldTypeMap.hasOwnProperty(schema.type)) {
         // @ts-ignore
         setFieldTypeToDataBind(schema.props.data_bind, fieldTypeMap[schema.type]);

package/dist/esm/upgrade/v2_8.js

@@ -14,7 +14,7 @@ function conversion(schema, payload) {
     if (schema.type === CONTROL_TYPE.SIMPLE_SEARCH && schema.children.length) {
         if (!schema.props.query_type_map) schema.props.query_type_map = [];
         schema.children.forEach(function(item) {
-            var _item_props_data_bind, _item_props;
+            var _item_props, _item_props_data_bind;
             if ([
                 FieldTypes.VARCHAR,
                 FieldTypes.TEXT,

package/dist/esm/upgrade/v3_0.js

@@ -60,7 +60,7 @@ function conversion(schema, payload) {
                     if ((_item_props7 = item.props) === null || _item_props7 === void 0 ? void 0 : _item_props7.check.is_show) {
                         item.children.push(optbtn.toSchema());
                     }
-                    (_item_props8 = item.props) === null || _item_props8 === void 0 ? true : delete _item_props8.check;
+                    (_item_props8 = item.props) === null || _item_props8 === void 0 ? void 0 : delete _item_props8.check;
                 }
                 if (((_item_props1 = item.props) === null || _item_props1 === void 0 ? void 0 : _item_props1.edit) !== undefined) {
                     var _item_props9, _item_props10, _item_props11, _item_props12, _item_props13, _item_props14;
@@ -78,7 +78,7 @@ function conversion(schema, payload) {
                     if ((_item_props13 = item.props) === null || _item_props13 === void 0 ? void 0 : _item_props13.edit.is_show) {
                         item.children.push(optbtn1.toSchema());
                     }
-                    (_item_props14 = item.props) === null || _item_props14 === void 0 ? true : delete _item_props14.edit;
+                    (_item_props14 = item.props) === null || _item_props14 === void 0 ? void 0 : delete _item_props14.edit;
                 }
                 if (((_item_props2 = item.props) === null || _item_props2 === void 0 ? void 0 : _item_props2.delete) !== undefined) {
                     var _item_props15, _item_props16, _item_props17, _item_props18, _item_props19, _item_props20;
@@ -98,7 +98,7 @@ function conversion(schema, payload) {
                     if ((_item_props19 = item.props) === null || _item_props19 === void 0 ? void 0 : _item_props19.delete.is_show) {
                         item.children.push(optbtn2.toSchema());
                     }
-                    (_item_props20 = item.props) === null || _item_props20 === void 0 ? true : delete _item_props20.delete;
+                    (_item_props20 = item.props) === null || _item_props20 === void 0 ? void 0 : delete _item_props20.delete;
                 }
             }
         });

package/dist/esm/upgrade/v3_1.js

@@ -3,8 +3,8 @@
  * @Autor: SuperLucky-Q
  * @Date: 2023-02-16 14:45:22
  * @LastEditors: SuperLuckyqi
- * @LastEditTime: 2024-01-05 15:23:17
- */ function _define_property(obj, key, value) {
+ * @LastEditTime: 2024-01-11 08:12:17
+ */ function _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -66,7 +66,7 @@ function conversion(schema, payload) {
     }
     var _obj;
     //默认值 赋值
-    var addKeysDefaultValueMapping = (_obj = {}, _define_property(_obj, CONTROL_TYPE.SUBTABLE, [
+    var addKeysDefaultValueMapping = (_obj = {}, _defineProperty(_obj, CONTROL_TYPE.SUBTABLE, [
         {
             key: "page_index",
             value: 1
@@ -88,7 +88,7 @@ function conversion(schema, payload) {
             key: "total_count",
             value: 0
         }
-    ]), _define_property(_obj, CONTROL_TYPE.GRID_TABLE, [
+    ]), _defineProperty(_obj, CONTROL_TYPE.GRID_TABLE, [
         {
             key: "page_index",
             value: 1
@@ -114,7 +114,7 @@ function conversion(schema, payload) {
             key: "is_show_selection",
             value: false
         }
-    ]), _define_property(_obj, CONTROL_TYPE.LIST_VIEW, [
+    ]), _defineProperty(_obj, CONTROL_TYPE.LIST_VIEW, [
         {
             key: "selection_type",
             value: "multiple"
@@ -127,7 +127,7 @@ function conversion(schema, payload) {
             key: "is_show_selection",
             value: false
         }
-    ]), _define_property(_obj, CONTROL_TYPE.SIMPLE_SEARCH, [
+    ]), _defineProperty(_obj, CONTROL_TYPE.SIMPLE_SEARCH, [
         {
             key: "col-gap",
             value: 24
@@ -136,7 +136,7 @@ function conversion(schema, payload) {
             key: "child-min-width",
             value: 230
         }
-    ]), _define_property(_obj, CONTROL_TYPE.IMPORT_RECORD_LIST_BUTTON, [
+    ]), _defineProperty(_obj, CONTROL_TYPE.IMPORT_RECORD_LIST_BUTTON, [
         {
             key: "template-type",
             value: "system"

package/dist/esm/upgrade/v3_3.js

@@ -0,0 +1,36 @@
+/*
+ * @Description: subtable-column 数据转换
+ * @Autor: SuperLucky-Q
+ * @Date: 2023-02-16 14:45:22
+ * @LastEditors: SuperLuckyqi
+ * @LastEditTime: 2023-12-21 11:12:25
+ */ 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) {
+    var listBtnArrs = [
+        CONTROL_TYPE.LIST_PAGE_BTN_BATCH_PRINT_RECORD,
+        CONTROL_TYPE.EXPORT_LIST_BUTTON,
+        CONTROL_TYPE.EXPORT_RECORD_LIST_BUTTON,
+        CONTROL_TYPE.CREATE_FORM_LIST_BUTTON,
+        CONTROL_TYPE.IMPORT_RECORD_LIST_BUTTON,
+        CONTROL_TYPE.SUBMISSION_RECORD_LIST_BUTTON,
+        CONTROL_TYPE.BATCH_DELETE_LIST_BUTTON,
+        CONTROL_TYPE.BUTTON,
+        CONTROL_TYPE.SUBMISSION_RECORD_LIST_BUTTON,
+        CONTROL_TYPE.LIST_PAGE_BTN_BATCH_PRINT
+    ];
+    if (listBtnArrs.includes(schema.type)) {
+        schema.control_type = "base";
+    }
+    return schema;
+}
+export { dataCleaner };