@byteluck-fe/model-driven-engine 2.7.0-alpha.31b → 2.7.0-alpha.35

package/dist/esm/common/OkWorker.js

@@ -1,4 +1,4 @@
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -12,24 +12,38 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-import { log } from '@byteluck-fe/model-driven-shared';
+function _define_property(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";
 var OkWorker = /*#__PURE__*/ function() {
     "use strict";
     function OkWorker() {
-        _classCallCheck(this, OkWorker);
+        _class_call_check(this, OkWorker);
+        _define_property(this, "worker", void 0);
     }
-    _createClass(OkWorker, [
+    _create_class(OkWorker, [
         {
             key: "run",
             value: function run(initState) {
                 this.worker = OkWorker.createWorker();
                 this.postMessage({
-                    action: 'init',
+                    action: "init",
                     payload: initState
                 });
             }
@@ -37,15 +51,15 @@ var OkWorker = /*#__PURE__*/ function() {
         {
             key: "destroy",
             value: function destroy() {
-                var ref;
-                (ref = this.worker) === null || ref === void 0 ? void 0 : ref.terminate();
+                var _this_worker;
+                (_this_worker = this.worker) === null || _this_worker === void 0 ? void 0 : _this_worker.terminate();
             }
         },
         {
             key: "postMessage",
             value: function postMessage(message) {
-                var ref;
-                (ref = this.worker) === null || ref === void 0 ? void 0 : ref.postMessage(message);
+                var _this_worker;
+                (_this_worker = this.worker) === null || _this_worker === void 0 ? void 0 : _this_worker.postMessage(message);
             }
         }
     ], [
@@ -71,7 +85,7 @@ var OkWorker = /*#__PURE__*/ function() {
                             set: function set(target, key, value) {
                                 if (parentKey) {
                                     _self.postMessage({
-                                        action: 'update',
+                                        action: "update",
                                         key: "".concat(parentKey, ".").concat(key)
                                     });
                                 }
@@ -79,7 +93,7 @@ var OkWorker = /*#__PURE__*/ function() {
                             }
                         };
                     };
-                    log('‍🚀 worker running');
+                    log("‍\uD83D\uDE80 worker running");
                     var _self = self;
                     // function createProxy(
                     // 	obj: Record<string, unknown> | Array<Record<string, unknown>>,
@@ -92,8 +106,8 @@ var OkWorker = /*#__PURE__*/ function() {
                     // 	}
                     // 	return new Proxy(obj, createHandler(parentKey))
                     // }
-                    _self.addEventListener('message', function(event) {
-                        var _data = event.data, action = _data.action, payload = _data.payload, fn = _data.fn;
+                    _self.addEventListener("message", function(event) {
+                        var _event_data = event.data, action = _event_data.action, payload = _event_data.payload, fn = _event_data.fn;
                         log(action, payload);
                         // 通过proxy进行代理，每次修改的时候，自动向外抛出postMessage
                         // data.key1 = 1
@@ -104,10 +118,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/Plugin.js

@@ -1,10 +1,10 @@
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
 var Plugin = function Plugin() {
     "use strict";
-    _classCallCheck(this, Plugin);
+    _class_call_check(this, Plugin);
 };
 export { Plugin };

package/dist/esm/common/Runtime.js

@@ -1,10 +1,10 @@
-function _assertThisInitialized(self) {
+function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     }
     return self;
 }
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -18,16 +18,29 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+function _define_property(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 _get_prototype_of(o) {
+    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
         return o.__proto__ || Object.getPrototypeOf(o);
     };
-    return _getPrototypeOf(o);
+    return _get_prototype_of(o);
 }
 function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
@@ -40,26 +53,26 @@ function _inherits(subClass, superClass) {
             configurable: true
         }
     });
-    if (superClass) _setPrototypeOf(subClass, superClass);
+    if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
+function _possible_constructor_return(self, call) {
+    if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
     }
-    return _assertThisInitialized(self);
+    return _assert_this_initialized(self);
 }
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
         o.__proto__ = p;
         return o;
     };
-    return _setPrototypeOf(o, p);
+    return _set_prototype_of(o, p);
 }
-var _typeof = function(obj) {
+function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _isNativeReflectConstruct() {
+}
+function _is_native_reflect_construct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
     if (Reflect.construct.sham) return false;
     if (typeof Proxy === "function") return true;
@@ -70,71 +83,59 @@ function _isNativeReflectConstruct() {
         return false;
     }
 }
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
+function _create_super(Derived) {
+    var hasNativeReflectConstruct = _is_native_reflect_construct();
     return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
+        var Super = _get_prototype_of(Derived), result;
         if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
+            var NewTarget = _get_prototype_of(this).constructor;
             result = Reflect.construct(Super, arguments, NewTarget);
         } else {
             result = Super.apply(this, arguments);
         }
-        return _possibleConstructorReturn(this, result);
+        return _possible_constructor_return(this, result);
     };
 }
-import { RegisterControls } from '@byteluck-fe/model-driven-core';
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, JSONCopy, loopFormSchema, isArray } from '@byteluck-fe/model-driven-shared';
-import { hasChildrenControl, loopDataViewControl, loopFormControl } from '../utils/runtimeUtils';
-export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
+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) {
     "use strict";
-    _inherits(Runtime, RegisterControls1);
-    var _super = _createSuper(Runtime);
+    _inherits(Runtime, RegisterControls);
+    var _super = _create_super(Runtime);
     function Runtime(props) {
-        _classCallCheck(this, Runtime);
+        _class_call_check(this, Runtime);
         var _this;
-        _this = _super.call(this, 'Runtime');
-        _this._flatInstances = [];
-        _this._instanceMap = {};
-        _this._controlParentIdMap = {};
+        _this = _super.call(this, "Runtime");
+        _define_property(_assert_this_initialized(_this), "_schema", void 0);
+        _define_property(_assert_this_initialized(_this), "_instance", void 0);
+        _define_property(_assert_this_initialized(_this), "_flatInstances", []);
+        _define_property(_assert_this_initialized(_this), "_instanceMap", {});
         var schema = props.schema;
         _this._schema = schema;
         _this._instance = _this.createControl(schema, props.beforeCreateInstance);
         _this.getFlatInstances();
         return _this;
     }
-    _createClass(Runtime, [
+    _create_class(Runtime, [
         {
             key: "getFlatInstances",
             value: function getFlatInstances() {
                 var instances = [];
                 var instanceMap = {};
-                var controlParentIdMap = {};
-                loop(this._instance, '', function(item, parentId) {
+                loop(this._instance, function(item) {
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
-                    //4.3.0-lh2 将自处注释掉，为使instance.parent能取到父级
-                    // if (item.type === 'subtable-row' || item.type === 'subtable-column') {
-                    //   return
-                    // }
-                    if (parentId) {
-                        // @ts-ignore
-                        controlParentIdMap[item.id] = parentId;
+                    if (item.type === "subtable-row" || item.type === "subtable-column") {
+                        return;
                     }
+                    instances.push(item);
                     if (!instanceMap[item.id]) {
                         instanceMap[item.id] = [];
                     }
-                    //不知为何subtable-column会多存一次
-                    if (item.type === 'subtable-column') {
-                        if (instanceMap[item.id].length > 0) {
-                            return;
-                        }
-                    }
-                    instances.push(item);
                     instanceMap[item.id].push(item);
                 });
                 this._flatInstances = instances;
                 this._instanceMap = instanceMap;
-                this._controlParentIdMap = controlParentIdMap;
                 return this._flatInstances;
             }
         },
@@ -168,9 +169,8 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
                 var antdRules = {};
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    ruleItems[dataView.id] = JSONCopy(result[0]);
-                    antdRules[dataView.id] = JSONCopy(result[0]);
+                    ruleItems[dataView.id] = dataView.rules[0];
+                    antdRules[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -193,9 +193,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             get: function get() {
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    // ruleItems[dataView.id] = dataView.rules[0]
-                    ruleItems[dataView.id] = result[0];
+                    ruleItems[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -214,9 +212,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             get: function get() {
                 var antdRules = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    // antdRules[dataView.id] = dataView.rules[0]
-                    antdRules[dataView.id] = result[0];
+                    antdRules[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -233,38 +229,30 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
     ]);
     return Runtime;
 }(RegisterControls);
-function loop(control, parentId, callback) {
-    var _instances = Array.isArray(control) ? control : [
-        control
-    ];
-    _instances.map(function(item) {
-        callback(item, parentId);
-        if (hasChildrenControl(item)) {
-            var ctl = item;
-            if (!ctl.children) {
-                ctl.children = [];
+function loop(control, callback) {
+    if (Array.isArray(control)) {
+        control.map(function(item) {
+            callback(item);
+            if (hasChildrenControl(item)) {
+                var ctl = item;
+                if (!ctl.children) {
+                    ctl.children = [];
+                }
+                // @ts-ignore
+                loop(ctl.children, callback);
             }
-            // @ts-ignore
-            loop(ctl.children, ctl.id, callback);
-        }
-        if (hasHeaderOrFooterControl(item, 'headers')) {
-            loop(item.props.headers, item.id, callback);
-        }
-        if (hasHeaderOrFooterControl(item, 'footers')) {
-            loop(item.props.footers, item.id, callback);
-        }
-    });
-}
-function hasHeaderOrFooterControl(control, checkType) {
-    return checkType in control.props && isArray(control.props[checkType]);
+        });
+    } else {
+        callback(control);
+    }
 }
-/**
- * 控件是否在视图中隐藏，遍历查找所有parent
+/**
+ * 控件是否在视图中隐藏，遍历查找所有parent
  * */ function getControlIsHide(control) {
     if (control.props.isHide) {
         return true;
     }
-    if (control.parent === null || control.parent === undefined) {
+    if (control.parent === null) {
         return false;
     }
     return getControlIsHide(control.parent);
@@ -274,16 +262,13 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        // data[item.id] = item.rules
-        data[item.id] = result;
+        data[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
-        // data[item.id] = item.rules
-        data[item.id] = result;
+        data[item.id] = item.rules;
         var itemRules = {
-            type: 'array',
+            type: "array",
             fields: {}
         };
         item.children.forEach(function(row, index) {
@@ -291,18 +276,13 @@ item) {
                 if (itemRules.fields) {
                     if (!itemRules.fields[index]) {
                         itemRules.fields[index] = {
-                            type: 'object',
+                            type: "object",
                             required: true,
                             fields: {}
                         };
                     }
-                    // // @ts-ignore
-                    // itemRules.fields[index].fields[formControl.id] = (
-                    //   formControl as RuntimeFormControl
-                    // ).rules
-                    var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
                     // @ts-ignore
-                    itemRules.fields[index].fields[formControl.id] = childResult;
+                    itemRules.fields[index].fields[formControl.id] = formControl.rules;
                 }
             });
         });
@@ -314,19 +294,15 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        // antdRules[item.id] = item.rules
-        antdRules[item.id] = result;
+        antdRules[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];
         item.children.forEach(function(row) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
-                // rules[formControl.id] = (formControl as RuntimeFormControl).rules
-                var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
-                rules[formControl.id] = childResult;
+                rules[formControl.id] = formControl.rules;
             });
             antdRules[item.id].push(rules);
         });