@byteluck-fe/model-driven-engine 2.5.0-alpha.9 → 2.5.0-beta.4

package/dist/esm/common/OkWorker.js

@@ -17,25 +17,11 @@ function _createClass(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-import { log } from "@byteluck-fe/model-driven-shared";
+import { log } from '@byteluck-fe/model-driven-shared';
 var OkWorker = /*#__PURE__*/ function() {
     "use strict";
     function OkWorker() {
         _classCallCheck(this, OkWorker);
-        _defineProperty(this, "worker", void 0);
     }
     _createClass(OkWorker, [
         {
@@ -43,7 +29,7 @@ var OkWorker = /*#__PURE__*/ function() {
             value: function run(initState) {
                 this.worker = OkWorker.createWorker();
                 this.postMessage({
-                    action: "init",
+                    action: 'init',
                     payload: initState
                 });
             }
@@ -51,15 +37,15 @@ var OkWorker = /*#__PURE__*/ function() {
         {
             key: "destroy",
             value: function destroy() {
-                var _this_worker;
-                (_this_worker = this.worker) === null || _this_worker === void 0 ? void 0 : _this_worker.terminate();
+                var ref;
+                (ref = this.worker) === null || ref === void 0 ? void 0 : ref.terminate();
             }
         },
         {
             key: "postMessage",
             value: function postMessage(message) {
-                var _this_worker;
-                (_this_worker = this.worker) === null || _this_worker === void 0 ? void 0 : _this_worker.postMessage(message);
+                var ref;
+                (ref = this.worker) === null || ref === void 0 ? void 0 : ref.postMessage(message);
             }
         }
     ], [
@@ -85,7 +71,7 @@ var OkWorker = /*#__PURE__*/ function() {
                             set: function set(target, key, value) {
                                 if (parentKey) {
                                     _self.postMessage({
-                                        action: "update",
+                                        action: 'update',
                                         key: "".concat(parentKey, ".").concat(key)
                                     });
                                 }
@@ -93,7 +79,7 @@ var OkWorker = /*#__PURE__*/ function() {
                             }
                         };
                     };
-                    log("‍\uD83D\uDE80 worker running");
+                    log('‍🚀 worker running');
                     var _self = self;
                     // function createProxy(
                     // 	obj: Record<string, unknown> | Array<Record<string, unknown>>,
@@ -106,8 +92,8 @@ var OkWorker = /*#__PURE__*/ function() {
                     // 	}
                     // 	return new Proxy(obj, createHandler(parentKey))
                     // }
-                    _self.addEventListener("message", function(event) {
-                        var _event_data = event.data, action = _event_data.action, payload = _event_data.payload, fn = _event_data.fn;
+                    _self.addEventListener('message', function(event) {
+                        var _data = event.data, action = _data.action, payload = _data.payload, fn = _data.fn;
                         log(action, payload);
                         // 通过proxy进行代理，每次修改的时候，自动向外抛出postMessage
                         // data.key1 = 1
@@ -118,10 +104,10 @@ var OkWorker = /*#__PURE__*/ function() {
                         //
                         // const result = fn(data, schema)
                         _self.postMessage({
-                            action: "delete",
+                            action: 'delete',
                             payload: {
-                                key: "key3[0].key1",
-                                value: "index"
+                                key: 'key3[0].key1',
+                                value: 'index'
                             }
                         });
                     });

package/dist/esm/common/Runtime.js

@@ -23,19 +23,6 @@ function _createClass(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
 function _getPrototypeOf(o) {
     _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
         return o.__proto__ || Object.getPrototypeOf(o);
@@ -96,21 +83,19 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import { RegisterControls } from "@byteluck-fe/model-driven-core";
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, loopFormSchema } from "@byteluck-fe/model-driven-shared";
-import { hasChildrenControl, loopDataViewControl, loopFormControl } from "../utils/runtimeUtils";
-export var Runtime = /*#__PURE__*/ function(RegisterControls) {
+import { RegisterControls } from '@byteluck-fe/model-driven-core';
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, loopFormSchema } from '@byteluck-fe/model-driven-shared';
+import { hasChildrenControl, loopDataViewControl, loopFormControl } from '../utils/runtimeUtils';
+export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
     "use strict";
-    _inherits(Runtime, RegisterControls);
+    _inherits(Runtime, RegisterControls1);
     var _super = _createSuper(Runtime);
     function Runtime(props) {
         _classCallCheck(this, Runtime);
         var _this;
-        _this = _super.call(this, "Runtime");
-        _defineProperty(_assertThisInitialized(_this), "_schema", void 0);
-        _defineProperty(_assertThisInitialized(_this), "_instance", void 0);
-        _defineProperty(_assertThisInitialized(_this), "_flatInstances", []);
-        _defineProperty(_assertThisInitialized(_this), "_instanceMap", {});
+        _this = _super.call(this, 'Runtime');
+        _this._flatInstances = [];
+        _this._instanceMap = {};
         var schema = props.schema;
         _this._schema = schema;
         _this._instance = _this.createControl(schema, props.beforeCreateInstance);
@@ -125,7 +110,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 var instanceMap = {};
                 loop(this._instance, function(item) {
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
-                    if (item.type === "subtable-row" || item.type === "subtable-column") {
+                    if (item.type === 'subtable-row' || item.type === 'subtable-column') {
                         return;
                     }
                     instances.push(item);
@@ -264,7 +249,7 @@ item) {
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
         data[item.id] = item.rules;
         var itemRules = {
-            type: "array",
+            type: 'array',
             fields: {}
         };
         item.children.forEach(function(row, index) {
@@ -272,7 +257,7 @@ item) {
                 if (itemRules.fields) {
                     if (!itemRules.fields[index]) {
                         itemRules.fields[index] = {
-                            type: "object",
+                            type: 'object',
                             required: true,
                             fields: {}
                         };

package/dist/esm/common/Store.js

@@ -32,28 +32,39 @@ function _defineProperty(obj, key, value) {
 }
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
+        return right[Symbol.hasInstance](left);
     } else {
         return left instanceof right;
     }
 }
-import { DataBind, ObjectDataBind } from "@byteluck-fe/model-driven-core";
-import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE, CONTROL_BASE_TYPE } from "@byteluck-fe/model-driven-shared";
-import { loopDataViewControl, loopFormControl, buildUUID } from "../utils/runtimeUtils";
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+import { DataBind, ObjectDataBind } from '@byteluck-fe/model-driven-core';
+import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE, CONTROL_BASE_TYPE } from '@byteluck-fe/model-driven-shared';
+import { loopDataViewControl, loopFormControl, buildUUID } from '../utils/runtimeUtils';
 var Store = /*#__PURE__*/ function() {
     "use strict";
     function Store(props) {
         _classCallCheck(this, Store);
-        _defineProperty(this, "emptyState", void 0);
-        _defineProperty(this, "state", void 0);
-        _defineProperty(this, "dataBindMapping", void 0 // 主要提供给二开使用
-        );
-        _defineProperty(this, "controlIdMapping", void 0);
-        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping;
+        var ref = init(props.instance), state = ref.state, emptyState = ref.emptyState, databindMapping = ref.databindMapping, controlidMapping = ref.controlidMapping, defaultState = ref.defaultState;
         this.emptyState = emptyState;
         this.state = state;
         this.dataBindMapping = databindMapping;
         this.controlIdMapping = controlidMapping;
+        this.defaultState = defaultState;
     }
     _createClass(Store, [
         {
@@ -63,7 +74,6 @@ var Store = /*#__PURE__*/ function() {
    * @param value
    */ key: "setState",
             value: function setState(controlId, value, rowIndex) {
-                var _this = this;
                 var controlInfo = this.controlIdMapping[controlId];
                 if (controlInfo !== undefined) {
                     //qiyu 按照对象赋值，Object.assign会触发多次key的change事件
@@ -78,14 +88,16 @@ var Store = /*#__PURE__*/ function() {
                 // }
                 } else {
                     if (rowIndex !== undefined) {
+                        var _this = this;
                         //TODO 目前只找了一层明细表，没有递归 如果是添加uid
                         Object.keys(this.controlIdMapping).map(function(subtableId) {
                             var dataView = _this.controlIdMapping[subtableId].dataView;
                             var children = _this.controlIdMapping[subtableId].children;
                             if (children !== undefined) {
+                                var _this1 = _this;
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
-                                        _this.state[dataView][subtableId][rowIndex][controlId] = value;
+                                        _this1.state[dataView][subtableId][rowIndex][controlId] = value;
                                     }
                                 });
                             }
@@ -100,7 +112,6 @@ var Store = /*#__PURE__*/ function() {
         {
             key: "getState",
             value: function getState(controlId, rowIndex) {
-                var _this = this;
                 //qiyu 由于header的数据是后补充的，所以从state获取第一层值。
                 // const controlInfo = this.controlIdMapping[controlId]
                 var detection = this.state[controlId];
@@ -112,27 +123,31 @@ var Store = /*#__PURE__*/ function() {
                         return this.state[controlInfo.dataView][controlId];
                     } else {
                         if (rowIndex !== undefined) {
+                            var _this = this;
                             var state;
                             //TODO 目前只找了一层明细表，没有递归
                             Object.keys(this.controlIdMapping).map(function(subtableId) {
                                 var dataViewId = _this.controlIdMapping[subtableId].dataView;
                                 var children = _this.controlIdMapping[subtableId].children;
                                 if (children !== undefined) {
+                                    var _this3 = _this;
                                     Object.keys(children).map(function(childControlId) {
                                         if (childControlId === controlId) {
-                                            var _this_state_dataViewId_subtableId_rowIndex;
-                                            state = (_this_state_dataViewId_subtableId_rowIndex = _this.state[dataViewId][subtableId][rowIndex]) === null || _this_state_dataViewId_subtableId_rowIndex === void 0 ? void 0 : _this_state_dataViewId_subtableId_rowIndex[controlId];
+                                            var ref;
+                                            state = (ref = _this3.state[dataViewId][subtableId][rowIndex]) === null || ref === void 0 ? void 0 : ref[controlId];
                                         }
                                     });
                                 }
                             });
                             return state;
                         } else {
+                            var _this2 = this;
                             var states = [];
                             Object.keys(this.controlIdMapping).map(function(subtableId) {
-                                var dataViewId = _this.controlIdMapping[subtableId].dataView;
-                                var children = _this.controlIdMapping[subtableId].children;
+                                var dataViewId = _this2.controlIdMapping[subtableId].dataView;
+                                var children = _this2.controlIdMapping[subtableId].children;
                                 if (children !== undefined) {
+                                    var _this = _this2;
                                     Object.keys(children).map(function(childControlId) {
                                         if (childControlId === controlId) {
                                             _this.state[dataViewId][subtableId].map(function(item) {
@@ -151,7 +166,6 @@ var Store = /*#__PURE__*/ function() {
         {
             key: "getEmptyState",
             value: function getEmptyState(controlId) {
-                var _this = this;
                 var detection = this.emptyState[controlId];
                 if (detection !== undefined) {
                     return this.emptyState[controlId];
@@ -160,22 +174,24 @@ var Store = /*#__PURE__*/ function() {
                     if (controlInfo !== undefined) {
                         var state = this.emptyState[controlInfo.dataView][controlId];
                         //判断找到的是否是明细表的控件
-                        if ("children" in controlInfo) {
+                        if ('children' in controlInfo) {
                             Object.assign(state, {
-                                uid: "new:" + buildUUID("uid")
+                                uid: 'new:' + buildUUID('uid')
                             });
                         }
                         return state;
                     } else {
+                        var _this = this;
                         var state1;
                         //TODO 目前只找了一层明细表，没有递归
                         Object.keys(this.controlIdMapping).map(function(subtableId) {
                             var dataViewId = _this.controlIdMapping[subtableId].dataView;
                             var children = _this.controlIdMapping[subtableId].children;
                             if (children !== undefined) {
+                                var _this4 = _this;
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
-                                        state1 = _this.emptyState[dataViewId][subtableId][controlId];
+                                        state1 = _this4.emptyState[dataViewId][subtableId][controlId];
                                     }
                                 });
                             }
@@ -214,6 +230,7 @@ function init(instance) {
     var emptyState = {};
     var databindMapping = {};
     var controlidMapping = {};
+    var defaultState = {};
     // loopFormControl(instance, (item, children) => {
     // })
     // @ts-ignore
@@ -229,11 +246,13 @@ function init(instance) {
             buildDataBindMapping(databindMapping, dvId, item);
             buildControlIdMapping(controlidMapping, dvId, item);
         });
-        state[dvId] = dataViewState;
+        state[dvId] = {};
+        defaultState[dvId] = dataViewState;
         emptyState[dvId] = emptyDataViewState;
     });
     return {
         state: state,
+        defaultState: defaultState,
         emptyState: emptyState,
         databindMapping: databindMapping,
         controlidMapping: controlidMapping
@@ -244,41 +263,43 @@ item) {
     //if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         // 2023-4-2 jiaqi 首次进入页面去除填充默认值
-        // dataViewState[item.id] = JSONCopy(item.props.defaultValue)
+        dataViewState[item.id] = JSONCopy(item.props.defaultValue);
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
     } else {
         var emptyTemplate = {};
         loopFormSchema(item.props.headers, function(headerItem) {
             emptyTemplate[headerItem.id] = JSONCopy(headerItem.props.defaultValue);
         });
-        var _item_props_defaultRows;
-        dataViewState[item.id] = new Array((_item_props_defaultRows = item.props.defaultRows) !== null && _item_props_defaultRows !== void 0 ? _item_props_defaultRows : 1).fill(0).map(function() {
-            return JSONCopy(emptyTemplate);
+        var _defaultRows;
+        dataViewState[item.id] = new Array((_defaultRows = item.props.defaultRows) !== null && _defaultRows !== void 0 ? _defaultRows : 1).fill(0).map(function() {
+            return _objectSpread({
+                uid: 'new:' + buildUUID('uid')
+            }, JSONCopy(emptyTemplate));
         });
         emptyDataViewState[item.id] = emptyTemplate;
     }
 }
 function buildDataBindMapping(data, dataViewId, // @ts-ignore
-item) {
+item1) {
     // if (item instanceof RuntimeFormControl) {
-    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        var _item_props, _item_props_dataBind;
-        if (_instanceof(item.props.dataBind, ObjectDataBind)) {
+    if (item1.controlType === CONTROL_BASE_TYPE.FORM) {
+        var ref, ref1;
+        if (_instanceof(item1.props.dataBind, ObjectDataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
-            Object.keys(item.props.dataBind).map(function(key) {
-                var dataBind = item.props.dataBind;
+            Object.keys(item1.props.dataBind).map(function(key) {
+                var dataBind = item1.props.dataBind;
                 var dataCode = dataBind[key].dataCode;
                 if (dataCode !== undefined) {
                     if (data[dataCode] === undefined) {
                         data[dataCode] = {
-                            controlId: item.id,
+                            controlId: item1.id,
                             fields: [],
                             dataViewId: dataViewId
                         };
                     }
                     data[dataCode].fields.push({
                         fieldCode: dataBind[key].fieldCode,
-                        controlId: item.id,
+                        controlId: item1.id,
                         dataBind: dataBind,
                         dataViewId: [
                             dataViewId
@@ -286,38 +307,38 @@ item) {
                     });
                 }
             });
-        } else if (((_item_props = item.props) === null || _item_props === void 0 ? void 0 : (_item_props_dataBind = _item_props.dataBind) === null || _item_props_dataBind === void 0 ? void 0 : _item_props_dataBind.dataCode) === undefined) {
+        } else if (((ref = item1.props) === null || ref === void 0 ? void 0 : (ref1 = ref.dataBind) === null || ref1 === void 0 ? void 0 : ref1.dataCode) === undefined) {
         //qiyu 2023-2-27 为空跳过。form自定义组件加载失败时，hack的组件props为空。
         } else {
-            if (data[item.props.dataBind.dataCode] === undefined) {
-                data[item.props.dataBind.dataCode] = {
+            if (data[item1.props.dataBind.dataCode] === undefined) {
+                data[item1.props.dataBind.dataCode] = {
                     controlId: dataViewId,
                     fields: [],
                     dataViewId: dataViewId
                 };
             }
-            data[item.props.dataBind.dataCode].fields.push({
-                fieldCode: item.props.dataBind.fieldCode,
-                controlId: item.id,
-                dataBind: item.props.dataBind,
+            data[item1.props.dataBind.dataCode].fields.push({
+                fieldCode: item1.props.dataBind.fieldCode,
+                controlId: item1.id,
+                dataBind: item1.props.dataBind,
                 dataViewId: [
                     dataViewId
                 ]
             });
         }
     } else {
-        if (item.props.datasourceBind.dataCode === "") {
+        if (item1.props.datasourceBind.dataCode === '') {
             //敏捷依赖后端生成dataCode，预览的时候没有
-            warn("datasourceBind.dataCode is empty! maybe in preview mode, control:".concat(item.id, " type:").concat(item.type));
+            warn("datasourceBind.dataCode is empty! maybe in preview mode, control:".concat(item1.id, " type:").concat(item1.type));
             return;
         }
-        data[item.props.datasourceBind.dataCode] = {
-            controlId: item.id,
+        data[item1.props.datasourceBind.dataCode] = {
+            controlId: item1.id,
             fields: [],
             dataViewId: dataViewId
         };
-        var subtableId = item.id;
-        loopFormSchema(item.props.headers, function(item) {
+        var subtableId = item1.id;
+        loopFormSchema(item1.props.headers, function(item) {
             if (_instanceof(item.props.dataBind, ObjectDataBind)) {
                 Object.keys(item.props.dataBind).map(function(key) {
                     var dataBind = item.props.dataBind;
@@ -359,16 +380,16 @@ item) {
         data[item.id] = {
             dataBind: new DataBind({
                 dataCode: item.props.datasourceBind.dataCode,
-                fieldCode: ""
+                fieldCode: ''
             }),
             dataView: dataViewId,
             children: {},
             options: []
         };
         loopFormSchema(item.props.headers, function(formControl) {
-            var _data_item_id;
-            var _data_item_id_children;
-            Object.assign((_data_item_id_children = (_data_item_id = data[item.id]) === null || _data_item_id === void 0 ? void 0 : _data_item_id.children) !== null && _data_item_id_children !== void 0 ? _data_item_id_children : {}, _defineProperty({}, formControl.id, {
+            var ref;
+            var ref2;
+            Object.assign((ref2 = (ref = data[item.id]) === null || ref === void 0 ? void 0 : ref.children) !== null && ref2 !== void 0 ? ref2 : {}, _defineProperty({}, formControl.id, {
                 dataBind: formControl.props.dataBind
             }));
         });