@byteluck-fe/model-driven-engine 3.0.0-beta.2 → 4.34.0-lx1

package/dist/esm/common/Engine.js

@@ -329,7 +329,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { isDataBind } from '@byteluck-fe/model-driven-core';
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, updateValueFromKeys, warn, Watcher, isBuiltInControls } from '@byteluck-fe/model-driven-shared';
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher, isBuiltInControls } from '@byteluck-fe/model-driven-shared';
 import { Runtime } from './Runtime';
 import { Store } from './Store';
 import { findItem, proxyState } from './proxyState';
@@ -355,18 +355,18 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         _this = _call_super(this, Engine), _define_property(_this, "store", void 0), _define_property(_this, "rawStore", {}), _define_property(_this, "parent", void 0), // 提供注册运行态控件以及实例化控件的能力
         _define_property(_this, "runtime", void 0), // 提供子线程处理脚本以及修改数据的能力
         // public worker: OkWorker
-        _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), _define_property(_this, "externalParams", void 0), _define_property(_this, "children", void 0), // 提供外部注册插件，在不同的hooks触发时执行固定函数的能力
+        _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), _define_property(_this, "externalParams", void 0), // 提供外部注册插件，在不同的hooks触发时执行固定函数的能力
         _define_property(_this, "__plugins", void 0), _define_property(_this, "__pluginsApplied", false), _define_property(_this, "$options", void 0), _define_property(_this, "actionManager", new ActionManager()), _define_property(_this, "dataManager", void 0), _define_property(_this, "_jobTasks", []), _define_property(_this, "createControlInstance", _this.createInstance);
         _this.$options = Object.freeze(props);
         var _this_$options = _this.$options, _this_$options_autoMount = _this_$options.autoMount, autoMount = _this_$options_autoMount === void 0 ? true : _this_$options_autoMount, schema = _this_$options.schema, beforeCreateInstance = _this_$options.beforeCreateInstance, externalParams = _this_$options.externalParams, _this_$options_language = _this_$options.// fieldModel,
-        language, language = _this_$options_language === void 0 ? DEFAULT_LOCALE : _this_$options_language, _this_$options_debug = _this_$options.debug, debug = _this_$options_debug === void 0 ? false : _this_$options_debug, messagesI18n = _this_$options.messagesI18n, children = _this_$options.children;
+        language, language = _this_$options_language === void 0 ? DEFAULT_LOCALE : _this_$options_language, _this_$options_debug = _this_$options.debug, debug = _this_$options_debug === void 0 ? false : _this_$options_debug;
+        RulesMessage.setLocale(language);
         _this.debug = debug;
         _this.runtime = new Runtime({
             schema: schema,
             beforeCreateInstance: beforeCreateInstance
         });
         _this.externalParams = externalParams;
-        _this.children = children;
         _this.store = new Store({
             instance: _this.runtime.instance
         });
@@ -441,7 +441,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_proxyStateBeforeSetCallback",
             value: function _proxyStateBeforeSetCallback(state, key, newValue, oldValue) {
-                var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
+                var _findItem = findItem(key, this), instance = _findItem.instance, rowIndex = _findItem.rowIndex;
                 // 找不到控件说明不是改动控件上的字段，直接通过
                 if (!instance) {
                     return newValue;
@@ -491,7 +491,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             key: "_handlerArrayUpdate",
             value: function _handlerArrayUpdate(state, key, type, args, result) {
                 var _this = this;
-                var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
+                var instanceItem = findItem(key, this);
+                var subtable = instanceItem.instance;
                 // if (!(subtable instanceof RuntimeListControl)) return
                 if (!((subtable === null || subtable === void 0 ? void 0 : subtable.controlType) === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
@@ -522,6 +523,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             createdNewRows = createRows(newRowLengths);
                             createdNewRowsData = args;
                             (_subtable_children = subtable.children)[type].apply(_subtable_children, _to_consumable_array(createdNewRows));
+                            this.runtime.getFlatInstances();
                             break;
                         case 'splice':
                             if (args.length > 2) {
@@ -539,6 +541,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     start,
                                     replace
                                 ].concat(_to_consumable_array(createdNewRows)));
+                                this.runtime.getFlatInstances();
                             // newValues.forEach((item: any, index) => {
                             //   let newIndex = start + index
                             //   this.setStates(item, newIndex, options)
@@ -554,12 +557,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     isDeleteLastOne = true;
                                 }
                                 (_subtable_children2 = subtable.children)[type].apply(_subtable_children2, _to_consumable_array(args));
+                                this.runtime.getFlatInstances();
                             }
                             break;
                         default:
                             var // @ts-ignore
                             _subtable_children3;
                             (_subtable_children3 = subtable.children)[type].apply(_subtable_children3, _to_consumable_array(args));
+                            this.runtime.getFlatInstances();
                             break;
                     }
                     if (type === 'splice') {
@@ -574,19 +579,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }
                     var subtableData = this.getState(subtable.id);
                     this._handlerSubtableUpdateUid(subtableData);
-                    this.runtime.getFlatInstances();
-                    var rowIndexs = createdNewRows.map(function(item) {
-                        var _item_children_, _item_children;
-                        var subControl = item === null || item === void 0 ? void 0 : (_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.children[0];
-                        return _this.getInstanceRowIndex(subControl);
-                    });
                     this.emit('list-change', {
                         instance: subtable,
                         value: subtableData,
                         options: Object.assign({}, options, {
                             changed: createdNewRows,
                             data: createdNewRowsData,
-                            rowIndexs: rowIndexs,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
                             jsonValue: JSON.stringify(subtableData),
                             isDeleteLastOne: isDeleteLastOne,
@@ -615,12 +613,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_handlerObjectUpdate",
             value: function _handlerObjectUpdate(state, key, value, oldValue) {
-                var _this = this;
-                var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
+                var _findItem = findItem(key, this), instance = _findItem.instance, rowIndex = _findItem.rowIndex;
                 if (!instance) {
                     return;
                 }
-                var index = this.getInstanceRowIndex(instance);
+                var index = rowIndex;
                 var options = eventOptionsTemp || {};
                 // if (instance instanceof RuntimeListControl) {
                 if (instance.controlType === CONTROL_BASE_TYPE.LIST && instance.type === CONTROL_TYPE.SUBTABLE) {
@@ -636,6 +633,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         row && newRows.push(row);
                     }
                     (_instance_children = instance.children).push.apply(_instance_children, _to_consumable_array(newRows));
+                    this.runtime.getFlatInstances();
                     // 这里已经能拿到控件实例，所以在这里触发setStates，触发每一行每一个控件的change事件
                     // for (let i = 0; i < newValue.length; i++) {
                     //   this.setStates(newValue[i], i, options)
@@ -643,14 +641,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var deleted = oldValue !== null && oldValue !== void 0 ? oldValue : [];
                     if ((options === null || options === void 0 ? void 0 : options.setData) === true) {
                         deleted = [];
-                    } else {}
-                    this.runtime.getFlatInstances();
+                    }
                     this._handlerSubtableUpdateUid(newValue);
-                    var rowIndexs = newRows.map(function(item) {
-                        var _item_children_, _item_children;
-                        var subControl = item === null || item === void 0 ? void 0 : (_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.children[0];
-                        return _this.getInstanceRowIndex(subControl);
-                    });
                     this.emit('list-change', {
                         instance: instance,
                         value: value,
@@ -658,7 +650,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             // @ts-ignore
                             changed: newRows,
                             data: newValue,
-                            rowIndexs: rowIndexs,
                             deleted: deleted,
                             // deleted: oldValue ?? [],
                             type: 'push',
@@ -1009,6 +1000,50 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 });
             }
         },
+        {
+            //理想-获取表单头部信息
+            key: "getTitleField",
+            value: function getTitleField(key) {
+                var titleData = Object.values(this.store.state).filter(function(a) {
+                    return a.submit_user;
+                })[0];
+                if (key) {
+                    return titleData[key];
+                } else {
+                    return titleData;
+                }
+            }
+        },
+        {
+            //理想-获取系统字段
+            key: "getSystemField",
+            value: function getSystemField(key) {
+                var _this_externalParams;
+                var systemCodesMap = [
+                    'creator',
+                    'process_location',
+                    'create_time',
+                    'uid',
+                    'update_time',
+                    'process_status',
+                    'process_instance_id',
+                    'process_key'
+                ];
+                var arr = ((_this_externalParams = this.externalParams) === null || _this_externalParams === void 0 ? void 0 : _this_externalParams.data.data_set.values.filter(function(a) {
+                    return systemCodesMap.some(function(k) {
+                        return k == a.code;
+                    });
+                })) || [];
+                if (key) {
+                    var _arr_filter_;
+                    return (_arr_filter_ = arr.filter(function(a) {
+                        return a.code == key;
+                    })[0]) === null || _arr_filter_ === void 0 ? void 0 : _arr_filter_.value;
+                } else {
+                    return arr;
+                }
+            }
+        },
         {
             /**
    * 通过dataCode和fieldCode来获取控件的值
@@ -1086,31 +1121,27 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                 var _controlIdMapping_key2;
                                 obj[(_controlIdMapping_key2 = controlIdMapping[key]) === null || _controlIdMapping_key2 === void 0 ? void 0 : _controlIdMapping_key2.dataBind.fieldCode] = getFieldData[key];
                             } else if ((_controlIdMapping_key1 = controlIdMapping[key]) === null || _controlIdMapping_key1 === void 0 ? void 0 : (_controlIdMapping_key_dataBind1 = _controlIdMapping_key1.dataBind) === null || _controlIdMapping_key_dataBind1 === void 0 ? void 0 : _controlIdMapping_key_dataBind1.dataCode) {
-                                if (!Array.isArray(getFieldData[key])) {
-                                // obj[controlIdMapping[key]?.dataBind.dataCode] = ''
-                                } else {
-                                    var _controlIdMapping_key3, _getFieldData_key;
-                                    // 明细字表只循环一层明细子表未递归
-                                    obj[(_controlIdMapping_key3 = controlIdMapping[key]) === null || _controlIdMapping_key3 === void 0 ? void 0 : _controlIdMapping_key3.dataBind.dataCode] = (_getFieldData_key = getFieldData[key]) === null || _getFieldData_key === void 0 ? void 0 : _getFieldData_key.map(function(item) {
-                                        var objChi = {};
-                                        for(var keyChi in item){
-                                            var _controlIdMapping_key_children_keyChi;
-                                            var fieldCode = (_controlIdMapping_key_children_keyChi = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi === void 0 ? void 0 : _controlIdMapping_key_children_keyChi.dataBind.fieldCode;
-                                            //未绑定字段的控件，直接抛弃
-                                            if (fieldCode !== '') {
-                                                if (fieldCode) {
-                                                    objChi[fieldCode] = item[keyChi];
-                                                } else {
-                                                    for(var keyChi1 in item[keyChi]){
-                                                        var _controlIdMapping_key_children_keyChi1;
-                                                        objChi[(_controlIdMapping_key_children_keyChi1 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi1 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi1.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
-                                                    }
+                                var _controlIdMapping_key3;
+                                // 明细字表只循环一层明细子表未递归
+                                obj[(_controlIdMapping_key3 = controlIdMapping[key]) === null || _controlIdMapping_key3 === void 0 ? void 0 : _controlIdMapping_key3.dataBind.dataCode] = getFieldData[key].map(function(item) {
+                                    var objChi = {};
+                                    for(var keyChi in item){
+                                        var _controlIdMapping_key_children_keyChi;
+                                        var fieldCode = (_controlIdMapping_key_children_keyChi = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi === void 0 ? void 0 : _controlIdMapping_key_children_keyChi.dataBind.fieldCode;
+                                        //未绑定字段的控件，直接抛弃
+                                        if (fieldCode !== '') {
+                                            if (fieldCode) {
+                                                objChi[fieldCode] = item[keyChi];
+                                            } else {
+                                                for(var keyChi1 in item[keyChi]){
+                                                    var _controlIdMapping_key_children_keyChi1;
+                                                    objChi[(_controlIdMapping_key_children_keyChi1 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi1 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi1.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
                                                 }
                                             }
                                         }
-                                        return objChi;
-                                    });
-                                }
+                                    }
+                                    return objChi;
+                                });
                             } else if (controlIdMapping[key]) {
                                 // 兼容一个控件需要绑定多个字段的情况
                                 for(var keyChi in getFieldData[key]){
@@ -1389,7 +1420,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 this.setStates(newState, undefined, _object_spread({
                     setData: true
                 }, options));
-                this.runtime.getFlatInstances();
                 this.debugLog("engine setData方法执行完成。");
             }
         },
@@ -1494,16 +1524,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var instances = Array.from(this.runtime.instanceMap[controlId] || []);
                 if (header) {
                     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
-                    // if (instances.length) {
-                    //   const instance: RuntimeControl = instances[0]
-                    //   const headerInstance = this.findSubtableHeadersControl(instance.id)
-                    //   if (headerInstance !== undefined) {
-                    //     instances.unshift(headerInstance)
-                    //   }
-                    // }
-                    var headerInstance = this.findSubtableHeadersControl(controlId);
-                    if (headerInstance !== undefined) {
-                        instances.unshift(headerInstance);
+                    if (instances.length) {
+                        var instance = instances[0];
+                        var headerInstance = this.findSubtableHeadersControl(instance.id);
+                        if (headerInstance !== undefined) {
+                            instances.unshift(headerInstance);
+                        }
                     }
                 }
                 // @ts-ignore
@@ -1568,7 +1594,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 var mapping = this.store.dataBindMapping[dataCode];
                 if (!mapping) {
-                    // warn(`No corresponding dataCode=${dataCode} was found`)
+                    warn("No corresponding dataCode=".concat(dataCode, " was found"));
                     return;
                 }
                 if (!fieldCode) {
@@ -1578,7 +1604,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     return item.fieldCode === fieldCode;
                 });
                 if (!dataBindMapping) {
-                    // warn(`No corresponding fieldCode=${fieldCode} was found`)
+                    warn("No corresponding fieldCode=".concat(fieldCode, " was found"));
                     return;
                 }
                 return dataBindMapping;

package/dist/esm/common/Runtime.js

@@ -110,7 +110,6 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 var instanceMap = {};
                 var controlParentIdMap = {};
                 loop(this._instance, '', function(item, parentId) {
-                    var _item_parent;
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
                     //4.3.0-lh2 将自处注释掉，为使instance.parent能取到父级
                     // if (item.type === 'subtable-row' || item.type === 'subtable-column') {
@@ -130,9 +129,6 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                         }
                     }
                     instances.push(item);
-                    if (((_item_parent = item.parent) === null || _item_parent === void 0 ? void 0 : _item_parent.type) === CONTROL_TYPE.SUBTABLE_COLUMN && item.parent.parent === undefined) {
-                        return;
-                    }
                     instanceMap[item.id].push(item);
                 });
                 this._flatInstances = instances;
@@ -281,9 +277,9 @@ function loop(control, parentId, callback) {
         if (hasHeaderOrFooterControl(item, 'headers')) {
             loop(item.props.headers, item.id, callback);
         }
-    // if (hasHeaderOrFooterControl(item, 'footers')) {
-    //   loop((item.props as any).footers, item.id, callback)
-    // }
+        if (hasHeaderOrFooterControl(item, 'footers')) {
+            loop(item.props.footers, item.id, callback);
+        }
     });
 }
 function hasHeaderOrFooterControl(control, checkType) {

package/dist/esm/common/Store.js

@@ -367,17 +367,15 @@ item) {
                 Object.keys(item.props.dataBind).map(function(key) {
                     var dataBind = item.props.dataBind;
                     var dataCode = dataBind[key].dataCode;
-                    if (dataBind[key].fieldCode !== '') {
-                        data[dataCode].fields.push({
-                            fieldCode: dataBind[key].fieldCode,
-                            controlId: item.id,
-                            dataBind: dataBind,
-                            dataViewId: [
-                                dataViewId,
-                                subtableId
-                            ]
-                        });
-                    }
+                    data[dataCode].fields.push({
+                        fieldCode: dataBind[key].fieldCode,
+                        controlId: item.id,
+                        dataBind: dataBind,
+                        dataViewId: [
+                            dataViewId,
+                            subtableId
+                        ]
+                    });
                 });
             } else {
                 if (data[item.props.dataBind.dataCode] === undefined) {

package/dist/esm/common/checkerValue.js

@@ -530,7 +530,7 @@ var ValueCheckerFactory = /*#__PURE__*/ function() {
                     case FieldTypes.VARCHAR:
                     case FieldTypes.TIMESTAMP:
                     case FieldTypes.TEXT:
-                    // case FieldTypes.RELATION:
+                    case FieldTypes.RELATION:
                     case FieldTypes.AUTO_NUMBER:
                         checker = new StringValueChecker();
                         break;

package/dist/esm/common/proxyState.js

@@ -28,7 +28,7 @@ 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 { error, logerror, JSONCopy } from '@byteluck-fe/model-driven-shared';
 var proxyArrayApi = [
     'splice',
     'push',
@@ -220,40 +220,33 @@ function flatInstanceForChildren(controls) {
  * 在flatInstance中通过key查找出对应的instance
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
- * */ export function findItem(flatInstance, key, instanceMap) {
-    if (key === '') return undefined;
+ * */ export function findItem(key, engine) {
+    if (key === '') return {
+        instance: undefined,
+        rowIndex: undefined
+    };
     var keys = key.split('.');
-    if (keys.length === 0) return undefined;
-    var oneKey = keys[0];
-    var otherKeys = keys.slice(1);
-    // 3.4.1 优化速度，读取instanceMap
-    // cc.time('findItem flatInstance find')
-    // const initInstance = flatInstance.find((item) => item.id === oneKey)
-    // cc.log('🏠 findItem flatInstance find result', initInstance)
-    // cc.timeEnd('findItem flatInstance find')
-    // cc.time('findItem instanceMap match')
-    var initInstance = instanceMap[oneKey] ? instanceMap[oneKey][0] : undefined;
-    // cc.log('🏠 findItem instanceMap match result', initInstance)
-    // cc.timeEnd('findItem instanceMap match')
-    if (otherKeys.length === 0) return initInstance;
-    // @ts-ignore
-    return otherKeys.reduce(function(prevItem, key) {
-        var index = Number(key);
-        var isNotIndex = Number.isNaN(index);
-        if (isNotIndex && prevItem) {
-            var flatChildren = (prevItem === null || prevItem === void 0 ? void 0 : prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
-            var findEndItem = flatChildren === null || flatChildren === void 0 ? void 0 : flatChildren.find(function(item) {
-                return item.id === key;
-            });
-            // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
-            return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
-        } else {
-            var _prevItem_children;
-            var _prevItem_children_index;
-            // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
-        }
-    }, initInstance);
+    if (keys.length === 0) return {
+        instance: undefined,
+        rowIndex: undefined
+    };
+    var instanceIndex = keys.filter(function(item) {
+        return !isNaN(item);
+    }).at(-1);
+    var findKeyIndex = instanceIndex ? keys.lastIndexOf(instanceIndex) : -1;
+    var rowIndex;
+    var controlId;
+    if (findKeyIndex > -1) {
+        rowIndex = Number(keys[findKeyIndex]);
+        controlId = keys === null || keys === void 0 ? void 0 : keys[findKeyIndex + 1];
+    } else {
+        controlId = keys[1];
+    }
+    var proxyInstance = engine.getInstance(controlId, rowIndex);
+    return {
+        instance: proxyInstance,
+        rowIndex: rowIndex
+    };
 }
 function getArrayNewValue(type, args) {
     if ([

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -160,13 +160,11 @@ import { EventLogic } from '@byteluck-fe/model-driven-shared';
 // }
 export var ControlsEventPlugin = /*#__PURE__*/ function() {
     "use strict";
-    function ControlsEventPlugin(config, customEvents) {
+    function ControlsEventPlugin(config) {
         _class_call_check(this, ControlsEventPlugin);
         _define_property(this, "config", void 0);
         _define_property(this, "engine", void 0);
-        _define_property(this, "customEvents", void 0);
         this.config = config;
-        this.customEvents = customEvents;
     }
     _create_class(ControlsEventPlugin, [
         {
@@ -203,14 +201,6 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
                         _this.engineAddEventListener(eventItem.code, eventItem.key);
                     }
                 });
-                //注册自定义组件事件
-                this.customEvents.map(function(item) {
-                    var key = item.key;
-                    if (item.namespace !== undefined && item.namespace !== null && item.namespace !== '') {
-                        key = item.namespace + ':' + item.key;
-                    }
-                    _this.engineAddEventListener(key, key);
-                });
             }
         },
         {

package/dist/esm/plugins/StylePlugin.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zhaoxiaoyang zhaoxiaoyang@byteluck.com
  * @Date: 2022-04-15 14:06:03
- * @LastEditors: SuperLuckyqi
- * @LastEditTime: 2024-11-08 11:17:53
+ * @LastEditors: zhaoxiaoyang zhaoxiaoyang@byteluck.com
+ * @LastEditTime: 2023-11-30 16:38:47
  * @FilePath: /model-driven/packages/engine/src/plugins/StylePlugin.ts
  */ function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -39,13 +39,10 @@ function _define_property(obj, key, value) {
 export var StylePlugin = /*#__PURE__*/ function() {
     "use strict";
     function StylePlugin(config) {
-        var isPC = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
         _class_call_check(this, StylePlugin);
         _define_property(this, "config", void 0);
         _define_property(this, "engine", void 0);
-        _define_property(this, "isPc", void 0);
         this.config = config;
-        this.isPc = isPC;
     }
     _create_class(StylePlugin, [
         {
@@ -56,16 +53,11 @@ export var StylePlugin = /*#__PURE__*/ function() {
                 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-' + engine.id;
+                style.className = 'edit-css';
+                style.type = 'text/css';
+                style.innerHTML = compiledStyle;
                 var dom = document.querySelector('head');
-                dom === null || dom === void 0 ? void 0 : dom.appendChild(style);
-                var cssStyleText;
-                if (this.isPc) {
-                    cssStyleText = ".render-engine-".concat(engine.id, "{ ").concat(compiledStyle, " }");
-                } else {
-                    cssStyleText = compiledStyle;
-                }
-                style.appendChild(document.createTextNode(cssStyleText));
+                dom.appendChild(style);
             }
         }
     ]);

package/dist/esm/utils/runtimeUtils.js

@@ -6,8 +6,7 @@ export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {
         control.map(function(item) {
             //TODO 此处需要再抽象一层 datagrid/datalist
-            // if (item.type === CONTROL_TYPE.SUBTABLE) {
-            if (item.controlType === CONTROL_BASE_TYPE.LIST) {
+            if (item.type === CONTROL_TYPE.SUBTABLE) {
                 // @ts-ignore
                 var children = []//item.getChildrenFormControl() as RuntimeFormControl[]
                 ;