@byteluck-fe/model-driven-engine 2.8.2-beta.1 → 2.8.2-beta.12

package/dist/esm/common/proxyState.js

@@ -15,6 +15,10 @@ function _non_iterable_spread() {
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -24,21 +28,21 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var cc = console;
-import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from '@byteluck-fe/model-driven-shared';
 var proxyArrayApi = [
-    "splice",
-    "push",
-    "shift",
-    "pop",
-    "unshift",
-    "reverse"
+    'splice',
+    'push',
+    'shift',
+    'pop',
+    'unshift',
+    'reverse'
 ];
-export var engineProxyFlag = Symbol("__engineProxy__");
-export var engineTargetKey = Symbol("__engineTarget__");
-export var engineArrayBeforeSetCallbackFlag = Symbol("__engineArrayBeforeSetCallbackFlag__");
-export var engineProxyThisKey = Symbol("__engineProxyThisKey__");
+export var engineProxyFlag = Symbol('__engineProxy__');
+export var engineTargetKey = Symbol('__engineTarget__');
+export var engineArrayBeforeSetCallbackFlag = Symbol('__engineArrayBeforeSetCallbackFlag__');
+export var engineProxyThisKey = Symbol('__engineProxyThisKey__');
 var currentHandlerState = {
-    type: "",
+    type: '',
     args: [],
     callback: emptyFn
 };
@@ -55,16 +59,16 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
     // 操作下标
     // Number(propertyKey) > target.length 说明当前操作的下标已经超过了安全范围（数组的运行长度，比如[1,2,3]，它的长度为3，可操作的下标为0,1,2,3，如果操作4将会产生一个empty index）
     if (index > target.length) {
-        error("Wrong array operations may cause unknown errors. It is recommended to use APIs such as ".concat(proxyArrayApi.join(","), " for array operations"));
+        error("Wrong array operations may cause unknown errors. It is recommended to use APIs such as ".concat(proxyArrayApi.join(','), " for array operations"));
         return;
     }
     // 不是操作下标，而是直接操作length或者自定义属性等
     var isNotHandlerIndex = Number.isNaN(index);
-    if (isNotHandlerIndex && propertyKey !== "length") {
+    if (isNotHandlerIndex && propertyKey !== 'length') {
         return;
     }
     // 直接操作length
-    if (propertyKey === "length") {
+    if (propertyKey === 'length') {
         var newLength = value;
         var oldLength = target.length;
         if (newLength > target.length) {
@@ -76,7 +80,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
         }
         // 通过操作length删除旧的行
         return function() {
-            return callback.call(null, target, thisKey, "splice", [
+            return callback.call(null, target, thisKey, 'splice', [
                 newLength,
                 oldLength - newLength
             ]);
@@ -86,13 +90,13 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
         // 正常操作
         if (index === target.length) {
             return function() {
-                return callback.call(null, target, thisKey, "push", [
+                return callback.call(null, target, thisKey, 'push', [
                     value
                 ]);
             };
         } else {
             return function() {
-                return callback.call(null, target, thisKey, "splice", [
+                return callback.call(null, target, thisKey, 'splice', [
                     index,
                     1,
                     value
@@ -128,9 +132,9 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             var newValue = JSONCopy(value);
             // @ts-ignore
             var oldValue = target[propertyKey];
-            var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
+            var concatKey = thisKey === '' ? propertyKey : thisKey + '.' + propertyKey;
             function reProxyState(value) {
-                if (typeof value === "object" && value !== null) {
+                if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === 'object' && value !== null) {
                     // @ts-ignore
                     if (value[engineProxyFlag] !== true) {
                         return proxyState(value, callback, beforeSetCallback, concatKey);
@@ -186,15 +190,15 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
  * @param beforeSetCallback
  * @param prevKey 递归对象的key
  * */ export function proxyState(state, callback, beforeSetCallback) {
-    var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "";
+    var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : '';
     // 冻结的对象不需要再执行proxy，否则会报错
     if (Object.isFrozen(state)) {
         return state;
     }
     for(var key in state){
-        var concatKey = prevKey === "" ? key : prevKey + "." + key;
+        var concatKey = prevKey === '' ? key : prevKey + '.' + key;
         var obj = state[key];
-        if (typeof obj === "object" && obj !== null) {
+        if ((typeof obj === "undefined" ? "undefined" : _type_of(obj)) === 'object' && obj !== null) {
             // @ts-ignore
             state[key] = proxyState(obj, callback, beforeSetCallback, concatKey);
         }
@@ -205,7 +209,7 @@ function flatInstanceForChildren(controls) {
     var result = [];
     controls.forEach(function(item) {
         result.push(item);
-        if (item.controlType === "layout" || item.controlType === "wrap") {
+        if (item.controlType === 'layout' || item.controlType === 'wrap') {
             var _result;
             (_result = result).push.apply(_result, _to_consumable_array(flatInstanceForChildren(item.children)));
         }
@@ -217,8 +221,8 @@ function flatInstanceForChildren(controls) {
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
  * */ export function findItem(flatInstance, key, instanceMap) {
-    if (key === "") return undefined;
-    var keys = key.split(".");
+    if (key === '') return undefined;
+    var keys = key.split('.');
     if (keys.length === 0) return undefined;
     var oneKey = keys[0];
     var otherKeys = keys.slice(1);
@@ -253,22 +257,22 @@ function flatInstanceForChildren(controls) {
 }
 function getArrayNewValue(type, args) {
     if ([
-        "push",
-        "unshift"
+        'push',
+        'unshift'
     ].includes(type)) {
         return args;
-    } else if (type === "splice") {
+    } else if (type === 'splice') {
         return args.slice(2);
     }
     return [];
 }
 function getArrayNewArgs(type, args, value) {
     if ([
-        "push",
-        "unshift"
+        'push',
+        'unshift'
     ].includes(type)) {
         return value;
-    } else if (type === "splice") {
+    } else if (type === 'splice') {
         return args.slice(0, 2).concat(value);
     }
 }
@@ -303,8 +307,8 @@ function getArrayNewArgs(type, args, value) {
                     // @ts-ignore
                     result = oldApiHandler.apply(this, args);
                 }
-                typeof currentHandlerState.callback === "function" && currentHandlerState.callback(key, args, result);
-                currentHandlerState.type = "";
+                typeof currentHandlerState.callback === 'function' && currentHandlerState.callback(key, args, result);
+                currentHandlerState.type = '';
                 currentHandlerState.args = [];
                 currentHandlerState.callback = emptyFn;
                 return result;

package/dist/esm/index.js

@@ -1,3 +1,3 @@
-export * from "./common";
-export * from "./plugins";
-export * from "./utils";
+export * from './common';
+export * from './plugins';
+export * from './utils';

package/dist/esm/plugins/CalcPlugin.js

@@ -47,6 +47,10 @@ function _non_iterable_spread() {
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -55,17 +59,17 @@ function _unsupported_iterable_to_array(o, minLen) {
     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);
 }
-import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from "@byteluck-fe/model-driven-shared";
-import { format } from "mathjs";
-var DisplayType;
-(function(DisplayType) {
+import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from '@byteluck-fe/model-driven-shared';
+import { format } from 'mathjs';
+var DisplayType = /*#__PURE__*/ function(DisplayType) {
     /**
    * 完全等于
    */ DisplayType["EQ"] = "EQ";
     /**
    * 包含
    * */ DisplayType["IN"] = "IN";
-})(DisplayType || (DisplayType = {}));
+    return DisplayType;
+}(DisplayType || {});
 export var CalcPlugin = /*#__PURE__*/ function() {
     "use strict";
     function CalcPlugin(options) {
@@ -170,7 +174,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 this.watchControlChange();
                 this.watchSubtableChange();
                 this.watchSchemaHideChange();
-                this.engine.on("engine-mounted", function() {
+                this.engine.on('engine-mounted', function() {
                     requestAnimationFrame(function() {
                         _this.resetDependencies();
                         _this.allCalcControlComputed();
@@ -274,8 +278,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * @description 监听控件的显隐事件，把显隐会影响的控件触发一遍计算
    * */ function watchSchemaHideChange() {
                 var _this = this;
-                this.engine.on("schema-change", function(payload) {
-                    if (payload.props === "isHide") {
+                this.engine.on('schema-change', function(payload) {
+                    if (payload.props === 'isHide') {
                         var _this_dependenciesTriggerMap_get;
                         var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
                         calcControls.forEach(function(calc) {
@@ -291,7 +295,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * @description 监听明细子表的change事件，把明细表会影响的控件触发一遍计算
    * */ function watchSubtableChange() {
                 var _this = this;
-                this.engine.on("list-change", function(payload) {
+                this.engine.on('list-change', function(payload) {
                     var _payload_options;
                     // 初始化前是批量操作。不做处理
                     if (_this.engine.isMounted === false) return;
@@ -319,7 +323,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * @description 监听控件的change事件，当控件change的时候，取到控件会影响的计算公式，然后执行对应的计算
    * */ function watchControlChange() {
                 var _this = this;
-                this.engine.on("change", function(payload) {
+                this.engine.on('change', function(payload) {
                     // 初始化前是批量操作。不做处理
                     if (_this.engine.isMounted === false) return;
                     var instance = payload.instance;
@@ -416,7 +420,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                         result += 0;
                     }
                     return result;
-                }, "");
+                }, '');
                 var value;
                 // 有缓存的话取缓存，没有缓存再执行eval
                 if (this.cacheComputedResult[scriptText] !== undefined) {
@@ -437,7 +441,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                     }
                 }
                 var oldValue = this.engine.getState(control.id, rowIndex);
-                var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === "" ? value : Number(value.toFixed(control.props.precision));
+                var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === '' ? value : Number(value.toFixed(control.props.precision));
                 // 如果值没变的话，不触发修改
                 if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
                     return;
@@ -445,7 +449,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 var _oldValue_unit;
                 this.engine.setState(control.id, {
                     result: result,
-                    unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
+                    unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ''
                 }, rowIndex);
             }
         },
@@ -454,14 +458,14 @@ export var CalcPlugin = /*#__PURE__*/ function() {
             value: /**
    * @description 获取数字值，因为计算公式可以依赖计算公式和金额，所以需要从value中取到对应的值
    * */ function getNumberValue(value) {
-                if (typeof value === "object" && value) {
-                    if ("result" in value) {
+                if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === 'object' && value) {
+                    if ('result' in value) {
                         return value.result;
-                    } else if ("amount" in value) {
+                    } else if ('amount' in value) {
                         return value.amount;
                     }
                 }
-                if (typeof value === "number") {
+                if (typeof value === 'number') {
                     return value;
                 }
                 return 0;

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -154,7 +154,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { EventLogic } from "@byteluck-fe/model-driven-shared";
+import { EventLogic } from '@byteluck-fe/model-driven-shared';
 // type EventKeyMap = {
 //   [eventKey in EventKeys]?: string
 // }
@@ -207,13 +207,13 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
             key: "engineAddEventListener",
             value: function engineAddEventListener(eventKey, controlEventKey) {
                 var _this = this;
-                this.engine.on(eventKey, function() {
+                this.engine.on(eventKey, /*#__PURE__*/ function() {
                     var _ref = _async_to_generator(function(payload) {
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     // 初始化state的时候不触发change事件,必须在engine mounted以后才触发
-                                    if ((eventKey === "change" || eventKey === "list-change") && !_this.engine.isMounted) {
+                                    if ((eventKey === 'change' || eventKey === 'list-change') && !_this.engine.isMounted) {
                                         return [
                                             2
                                         ];
@@ -262,7 +262,7 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
                                 }
                                 return [
                                     4,
-                                    Promise.all(events[name].map(function() {
+                                    Promise.all(events[name].map(/*#__PURE__*/ function() {
                                         var _ref = _async_to_generator(function(eventName) {
                                             var execResult;
                                             return _ts_generator(this, function(_state) {

package/dist/esm/plugins/ES6ModulePlugin.js

@@ -76,7 +76,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     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);
 }
-import { error } from "@byteluck-fe/model-driven-shared";
+import { error } from '@byteluck-fe/model-driven-shared';
 export var ES6ModulePlugin = /*#__PURE__*/ function() {
     "use strict";
     function ES6ModulePlugin(config, env, eventJs) {
@@ -170,11 +170,11 @@ export function parseModule(action, engine, env) {
         }
     };
     try {
-        new Function("module", "exports", compiled).call(module, module, module.exports);
+        new Function('module', 'exports', compiled).call(module, module, module.exports);
     } catch (e) {
-        error(e.message + ". fail to parse the module");
-        if (process.env.NODE_ENV !== "production") {
-            error("fail to parse the module");
+        error(e.message + '. fail to parse the module');
+        if (process.env.NODE_ENV !== 'production') {
+            error('fail to parse the module');
         }
     }
     var funcMap = {};
@@ -183,7 +183,7 @@ export function parseModule(action, engine, env) {
     try {
         for(var _iterator = Object.entries(module.exports)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
-            if (typeof value === "function") {
+            if (typeof value === 'function') {
                 funcMap[key] = value;
             } else {
                 variables[key] = value;

package/dist/esm/plugins/LifecycleEventPlugin.js

@@ -201,10 +201,11 @@ function _ts_generator(thisArg, body) {
     }
 }
 var LifecycleEventKeyMap = {
-    "engine-mounted": "did_mount",
-    "engine-submit": "will_submit",
-    "engine-submit-params": "do_submit",
-    "engine-submitted": "did_submit"
+    'engine-initialized': 'did_init',
+    'engine-mounted': 'did_mount',
+    'engine-submit': 'will_submit',
+    'engine-submit-params': 'do_submit',
+    'engine-submitted': 'did_submit'
 };
 export var LifecycleEventPlugin = /*#__PURE__*/ function() {
     "use strict";
@@ -223,7 +224,7 @@ export var LifecycleEventPlugin = /*#__PURE__*/ function() {
                 Object.entries(LifecycleEventKeyMap).forEach(function(param) {
                     var _param = _sliced_to_array(param, 2), engineKey = _param[0], lifecycleKey = _param[1];
                     var _this1 = _this;
-                    engine.on(engineKey, function() {
+                    engine.on(engineKey, /*#__PURE__*/ function() {
                         var _ref = _async_to_generator(function(payload) {
                             var result;
                             return _ts_generator(this, function(_state) {
@@ -277,7 +278,7 @@ export var LifecycleEventPlugin = /*#__PURE__*/ function() {
                                 }
                                 return [
                                     4,
-                                    Promise.all(events[name].map(function() {
+                                    Promise.all(events[name].map(/*#__PURE__*/ function() {
                                         var _ref = _async_to_generator(function(eventName) {
                                             var execResult;
                                             return _ts_generator(this, function(_state) {

package/dist/esm/plugins/StylePlugin.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zhaoxiaoyang zhaoxiaoyang@byteluck.com
  * @Date: 2022-04-15 14:06:03
- * @LastEditors: zhaoxiaoyang zhaoxiaoyang@byteluck.com
- * @LastEditTime: 2023-11-30 16:38:47
+ * @LastEditors: SuperLuckyqi
+ * @LastEditTime: 2025-01-10 17:47:28
  * @FilePath: /model-driven/packages/engine/src/plugins/StylePlugin.ts
  */ function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -51,13 +51,14 @@ export var StylePlugin = /*#__PURE__*/ function() {
                 var _this_config;
                 this.engine = engine;
                 var _this_config_source;
-                var compiledStyle = (_this_config_source = (_this_config = this.config) === null || _this_config === void 0 ? void 0 : _this_config.source) !== null && _this_config_source !== void 0 ? _this_config_source : "";
-                var style = document.createElement("style");
-                style.className = "edit-css";
-                style.type = "text/css";
-                style.innerHTML = compiledStyle;
-                var dom = document.querySelector("head");
-                dom.appendChild(style);
+                var compiledStyle = (_this_config_source = (_this_config = this.config) === null || _this_config === void 0 ? void 0 : _this_config.source) !== null && _this_config_source !== void 0 ? _this_config_source : '';
+                var style = document.createElement('style');
+                style.className = 'edit-css-' + engine.id;
+                var dom = document.querySelector('head');
+                dom === null || dom === void 0 ? void 0 : dom.appendChild(style);
+                var cssStyleText;
+                cssStyleText = ".render-engine-".concat(engine.id, "{ ").concat(compiledStyle, " }");
+                style.appendChild(document.createTextNode(cssStyleText));
             }
         }
     ]);

package/dist/esm/plugins/index.js

@@ -1,5 +1,5 @@
-export * from "./ES6ModulePlugin";
-export * from "./LifecycleEventPlugin";
-export * from "./ControlsEventPlugin";
-export * from "./CalcPlugin";
-export * from "./StylePlugin";
+export * from './ES6ModulePlugin';
+export * from './LifecycleEventPlugin';
+export * from './ControlsEventPlugin';
+export * from './CalcPlugin';
+export * from './StylePlugin';

package/dist/esm/utils/index.js

@@ -1 +1 @@
-export * from "./runtimeUtils";
+export * from './runtimeUtils';

package/dist/esm/utils/runtimeUtils.js

@@ -1,6 +1,6 @@
-import { CONTROL_BASE_TYPE, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 export function hasChildrenControl(instance) {
-    return instance.controlType === CONTROL_BASE_TYPE.LAYOUT || instance.controlType === CONTROL_BASE_TYPE.WRAP || instance.controlType === CONTROL_BASE_TYPE.LIST || instance.controlType === CONTROL_BASE_TYPE.SEARCH;
+    return instance.controlType === CONTROL_BASE_TYPE.LAYOUT || instance.controlType === CONTROL_BASE_TYPE.WRAP || instance.controlType === CONTROL_BASE_TYPE.LIST || instance.controlType === CONTROL_BASE_TYPE.SEARCH || instance.controlType === CONTROL_BASE_TYPE.COLUMN && instance.type !== CONTROL_TYPE.OPERATION_COLUMN;
 }
 export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {
@@ -36,9 +36,9 @@ callback) {
 var unique = 0;
 // uuid生成
 export function buildUUID() {
-    var prefix = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "";
+    var prefix = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : '';
     var time = Date.now();
     var random = Math.floor(Math.random() * 1000000000);
     unique++;
-    return prefix + "_" + random + unique + String(time);
+    return prefix + '_' + random + unique + String(time);
 }