@byteluck-fe/model-driven-engine 2.8.1-alpha.1 → 2.8.1-alpha.12

package/dist/esm/common/Engine.js

@@ -902,11 +902,30 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "getRules",
             value: function getRules(controlId) {
+                var isGetFieldCodeRules = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+                var controlIdRules = this.runtime.rules;
+                var fieldCodeRules = this.runtime.fieldCodeRules;
+                var controlIdMapping = this.store.controlIdMapping;
+                var rules = isGetFieldCodeRules ? fieldCodeRules : controlIdRules;
                 if (controlId === undefined) {
-                    return this.runtime.rules;
+                    return isGetFieldCodeRules ? fieldCodeRules : rules;
                 } else {
-                    var _this_runtime_rules_controlId;
-                    return (_this_runtime_rules_controlId = this.runtime.rules[controlId]) === null || _this_runtime_rules_controlId === void 0 ? void 0 : _this_runtime_rules_controlId.fields;
+                    var _controlIdMapping_controlId, _controlIdMapping_controlId_dataBind, _controlIdMapping_controlId_dataBind1;
+                    controlId = isGetFieldCodeRules ? ((_controlIdMapping_controlId = controlIdMapping[controlId]) === null || _controlIdMapping_controlId === void 0 ? void 0 : _controlIdMapping_controlId.children) ? (_controlIdMapping_controlId_dataBind = controlIdMapping[controlId].dataBind) === null || _controlIdMapping_controlId_dataBind === void 0 ? void 0 : _controlIdMapping_controlId_dataBind.dataCode : ((_controlIdMapping_controlId_dataBind1 = controlIdMapping[controlId].dataBind) === null || _controlIdMapping_controlId_dataBind1 === void 0 ? void 0 : _controlIdMapping_controlId_dataBind1.fieldCode) || controlId : controlId;
+                    if (controlId in rules) {
+                        var _rules_controlId;
+                        return (_rules_controlId = rules[controlId]) === null || _rules_controlId === void 0 ? void 0 : _rules_controlId.fields;
+                    }
+                    var ruleItems;
+                    for(var id in rules){
+                        var _rules_id;
+                        if (controlId in (((_rules_id = rules[id]) === null || _rules_id === void 0 ? void 0 : _rules_id.fields) || {})) {
+                            var _rules_id_fields, _rules_id1;
+                            ruleItems = (_rules_id1 = rules[id]) === null || _rules_id1 === void 0 ? void 0 : (_rules_id_fields = _rules_id1.fields) === null || _rules_id_fields === void 0 ? void 0 : _rules_id_fields[controlId];
+                            break;
+                        }
+                    }
+                    return ruleItems;
                 }
             }
         },
@@ -1471,35 +1490,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
                     if (instances.length) {
                         var instance = instances[0];
-                        var headerInstance = this.getInstanceInSubtableHeader(instance);
-                        if (headerInstance) {
+                        var headerInstance = this.findSubtableHeadersControl(instance.id);
+                        if (headerInstance !== undefined) {
                             instances.unshift(headerInstance);
                         }
-                    } else {
-                        var _this_getControlIdMapping;
-                        var controlIdMapping = (_this_getControlIdMapping = this.getControlIdMapping()) !== null && _this_getControlIdMapping !== void 0 ? _this_getControlIdMapping : {};
-                        var _Object_entries_find;
-                        var _ref = _sliced_to_array((_Object_entries_find = Object.entries(controlIdMapping).find(function(param) {
-                            var _param = _sliced_to_array(param, 2), _ = _param[0], mapping = _param[1];
-                            return mapping.children && controlId in mapping.children;
-                        })) !== null && _Object_entries_find !== void 0 ? _Object_entries_find : [], 1), subtableId = _ref[0];
-                        if (subtableId) {
-                            var subtable = this.getInstance(subtableId);
-                            // @ts-ignore
-                            var headerColumn = subtable.props.headers.find(function(column) {
-                                return column.children.find(function(item) {
-                                    return item.id === controlId;
-                                });
-                            });
-                            if (headerColumn) {
-                                var headerInstance1 = headerColumn.children.find(function(item) {
-                                    return item.id === controlId;
-                                });
-                                if (headerInstance1) {
-                                    instances.unshift(headerInstance1);
-                                }
-                            }
-                        }
                     }
                 }
                 // @ts-ignore
@@ -1741,18 +1735,29 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "inList",
             value: function inList(controlId) {
-                var _this_store_controlIdMapping;
-                var mapping = (_this_store_controlIdMapping = this.store.controlIdMapping) !== null && _this_store_controlIdMapping !== void 0 ? _this_store_controlIdMapping : {};
-                var listKey = undefined;
-                Object.keys(mapping).some(function(key) {
-                    var _mapping_key_children, _mapping_key;
-                    var matched = (_mapping_key = mapping[key]) === null || _mapping_key === void 0 ? void 0 : (_mapping_key_children = _mapping_key.children) === null || _mapping_key_children === void 0 ? void 0 : _mapping_key_children.hasOwnProperty(controlId);
-                    if (matched) {
-                        listKey = key;
+                var mapping = this.store.subtableHeadersControlIdMapping;
+                var subtableId = undefined;
+                for(var key in mapping){
+                    if (controlId in mapping[key]) {
+                        subtableId = key;
+                        break;
                     }
-                    return matched;
-                });
-                return listKey;
+                }
+                return subtableId;
+            }
+        },
+        {
+            key: "findSubtableHeadersControl",
+            value: function findSubtableHeadersControl(controlId) {
+                var mapping = this.store.subtableHeadersControlIdMapping;
+                var instance = undefined;
+                for(var key in mapping){
+                    if (controlId in mapping[key]) {
+                        instance = mapping[key][controlId];
+                        break;
+                    }
+                }
+                return instance;
             }
         }
     ], [

package/dist/esm/common/Runtime.js

@@ -96,7 +96,7 @@ function _create_super(Derived) {
         return _possible_constructor_return(this, result);
     };
 }
-import { RegisterControls } from "@byteluck-fe/model-driven-core";
+import { RegisterControls, isDataBind } 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(RegisterControls) {
@@ -180,26 +180,33 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
         {
             key: "allRules",
             get: function get() {
-                var antdRules = {};
-                var ruleItems = {};
+                var defaultAntdRules = {};
+                var defaultRule = {};
+                var defaultFieldRules = {};
                 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]);
+                    defaultRule[dataView.id] = JSONCopy(result[0]);
+                    defaultAntdRules[dataView.id] = JSONCopy(result[0]);
+                    defaultFieldRules[dataView.id] = JSONCopy(result[0]);
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
                         //   item instanceof RuntimeListControl
                         // ) {
                         if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
-                            buildControlRules(ruleItems[dataView.id].fields, item);
-                            buildControlAntdRules(antdRules[dataView.id].fields, item);
+                            buildControlRules(defaultRule[dataView.id].fields, item, true);
+                            buildControlAntdRules(defaultAntdRules[dataView.id].fields, item, true);
+                            buildFieldCodeRules(defaultFieldRules[dataView.id].fields, item, true);
                         }
                     });
                 });
                 return {
-                    rules: ruleItems,
-                    antdRules: antdRules
+                    rules: this.rules,
+                    antdRules: this.antdRules,
+                    fieldCodeRules: this.fieldCodeRules,
+                    defaultAntdRules: defaultAntdRules,
+                    defaultRule: defaultRule,
+                    defaultFieldRules: defaultFieldRules
                 };
             }
         },
@@ -224,6 +231,27 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 return ruleItems;
             }
         },
+        {
+            key: "fieldCodeRules",
+            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];
+                    loopFormControl(dataView.children, function(item) {
+                        // if (
+                        //   item instanceof RuntimeFormControl ||
+                        //   item instanceof RuntimeListControl
+                        // ) {
+                        if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
+                            buildFieldCodeRules(ruleItems[dataView.id].fields, item);
+                        }
+                    });
+                });
+                return ruleItems;
+            }
+        },
         {
             key: "antdRules",
             get: function get() {
@@ -286,6 +314,7 @@ function hasHeaderOrFooterControl(control, checkType) {
 }
 function buildControlRules(data, // @ts-ignore
 item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (getControlIsHide(item)) {
         return;
     }
@@ -301,7 +330,11 @@ item) {
             type: "array",
             fields: {}
         };
-        item.children.forEach(function(row, index) {
+        (isSubtableDefaultRules === true ? [
+            {
+                children: item.props.headers
+            }
+        ] : item.children).forEach(function(row, index) {
             loopFormSchema(row.children, function(formControl) {
                 if (itemRules.fields) {
                     if (!itemRules.fields[index]) {
@@ -324,8 +357,92 @@ item) {
         data[item.id].push(itemRules);
     }
 }
+function buildFieldCodeRules(data, // @ts-ignore
+item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+    if (getControlIsHide(item)) {
+        return;
+    }
+    var result = Runtime.staticGetRules(item.type, item.props);
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
+        if (isDataBind(item.props.dataBind)) {
+            var _item_props_dataBind;
+            if (((_item_props_dataBind = item.props.dataBind) === null || _item_props_dataBind === void 0 ? void 0 : _item_props_dataBind.fieldCode) != "") {
+                var _item_props_dataBind1;
+                data[(_item_props_dataBind1 = item.props.dataBind) === null || _item_props_dataBind1 === void 0 ? void 0 : _item_props_dataBind1.fieldCode] = result;
+            }
+        } else {
+            for(var dataBindKey in item.props.dataBind){
+                var _item_props_dataBind_dataBindKey;
+                // @ts-ignore
+                if (((_item_props_dataBind_dataBindKey = item.props.dataBind[dataBindKey]) === null || _item_props_dataBind_dataBindKey === void 0 ? void 0 : _item_props_dataBind_dataBindKey.fieldCode) != "") {
+                    var // @ts-ignore
+                    _item_props_dataBind_dataBindKey1, _findFields;
+                    // @ts-ignore
+                    data[(_item_props_dataBind_dataBindKey1 = item.props.dataBind[dataBindKey]) === null || _item_props_dataBind_dataBindKey1 === void 0 ? void 0 : _item_props_dataBind_dataBindKey1.fieldCode] = ((_findFields = findFields(result)) === null || _findFields === void 0 ? void 0 : _findFields[dataBindKey]) || [];
+                }
+            }
+        }
+    } else if (item.type === CONTROL_TYPE.SUBTABLE) {
+        var _item_props_datasourceBind, _item_props_datasourceBind1;
+        data[(_item_props_datasourceBind = item.props.datasourceBind) === null || _item_props_datasourceBind === void 0 ? void 0 : _item_props_datasourceBind.dataCode] = result;
+        var itemRules = {
+            type: "array",
+            fields: {}
+        };
+        (isSubtableDefaultRules === true ? [
+            {
+                children: item.props.headers
+            }
+        ] : item.children).forEach(function(row, index) {
+            loopFormSchema(row.children, function(formControl) {
+                if (itemRules.fields) {
+                    if (!itemRules.fields[index]) {
+                        itemRules.fields[index] = {
+                            type: "object",
+                            required: true,
+                            fields: {}
+                        };
+                    }
+                    var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
+                    if (!isDataBind(formControl.props.dataBind)) {
+                        for(var dataBindKey in formControl.props.dataBind){
+                            var _formControl_props_dataBind_dataBindKey;
+                            // @ts-ignore
+                            if (((_formControl_props_dataBind_dataBindKey = formControl.props.dataBind[dataBindKey]) === null || _formControl_props_dataBind_dataBindKey === void 0 ? void 0 : _formControl_props_dataBind_dataBindKey.fieldCode) != "") {
+                                var _findFields;
+                                // @ts-ignore
+                                itemRules.fields[index].fields[// @ts-ignore
+                                formControl.props.dataBind[dataBindKey].fieldCode] = ((_findFields = findFields(childResult)) === null || _findFields === void 0 ? void 0 : _findFields[dataBindKey]) || [];
+                            }
+                        }
+                    } else {
+                        var _formControl_props_dataBind;
+                        if (((_formControl_props_dataBind = formControl.props.dataBind) === null || _formControl_props_dataBind === void 0 ? void 0 : _formControl_props_dataBind.fieldCode) != "") {
+                            var _formControl_props_dataBind1;
+                            // @ts-ignore
+                            itemRules.fields[index].fields[(_formControl_props_dataBind1 = formControl.props.dataBind) === null || _formControl_props_dataBind1 === void 0 ? void 0 : _formControl_props_dataBind1.fieldCode] = childResult;
+                        }
+                    }
+                }
+            });
+        });
+        data[(_item_props_datasourceBind1 = item.props.datasourceBind) === null || _item_props_datasourceBind1 === void 0 ? void 0 : _item_props_datasourceBind1.dataCode].push(itemRules);
+    }
+}
+function findFields(childResult) {
+    var ruleItem = {};
+    childResult.map(function(item) {
+        if (item.fields) {
+            ruleItem = item;
+        }
+    });
+    return ruleItem === null || ruleItem === void 0 ? void 0 : ruleItem.fields;
+}
 function buildControlAntdRules(antdRules, // @ts-ignore
 item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (getControlIsHide(item)) {
         return;
     }
@@ -336,7 +453,11 @@ item) {
         antdRules[item.id] = result;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];
-        item.children.forEach(function(row) {
+        (isSubtableDefaultRules === true ? [
+            {
+                children: item.props.headers
+            }
+        ] : item.children).forEach(function(row) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
                 // rules[formControl.id] = (formControl as RuntimeFormControl).rules

package/dist/esm/common/Store.js

@@ -57,13 +57,15 @@ var Store = /*#__PURE__*/ function() {
         _define_property(this, "dataBindMapping", void 0 // 主要提供给二开使用
         );
         _define_property(this, "controlIdMapping", void 0);
+        _define_property(this, "subtableHeadersControlIdMapping", void 0);
         _define_property(this, "defaultState", void 0);
-        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping, defaultState = _init.defaultState;
+        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping, defaultState = _init.defaultState, subtableHeadersControlIdMapping = _init.subtableHeadersControlIdMapping;
         this.emptyState = emptyState;
         this.state = state;
         this.dataBindMapping = databindMapping;
         this.controlIdMapping = controlidMapping;
         this.defaultState = defaultState;
+        this.subtableHeadersControlIdMapping = subtableHeadersControlIdMapping;
     }
     _create_class(Store, [
         {
@@ -233,6 +235,7 @@ function init(instance) {
     var emptyState = {};
     var databindMapping = {};
     var controlidMapping = {};
+    var subtableHeadersControlIdMapping = {};
     var defaultState = {};
     // loopFormControl(instance, (item, children) => {
     // })
@@ -248,6 +251,7 @@ function init(instance) {
             buildState(dataViewState, emptyDataViewState, item);
             buildDataBindMapping(databindMapping, dvId, item);
             buildControlIdMapping(controlidMapping, dvId, item);
+            buildSubtableHeadersControlIdMapping(subtableHeadersControlIdMapping, item);
         });
         state[dvId] = {};
         defaultState[dvId] = dataViewState;
@@ -256,6 +260,7 @@ function init(instance) {
     return {
         state: state,
         defaultState: defaultState,
+        subtableHeadersControlIdMapping: subtableHeadersControlIdMapping,
         emptyState: emptyState,
         databindMapping: databindMapping,
         controlidMapping: controlidMapping
@@ -400,4 +405,17 @@ item) {
         });
     }
 }
+function buildSubtableHeadersControlIdMapping(data, // @ts-ignore
+item) {
+    if (item.type === CONTROL_TYPE.SUBTABLE) {
+        var headersInstances = {};
+        item.props.headers.map(// @ts-ignore
+        function(item) {
+            item.children.map(function(item) {
+                Object.assign(headersInstances, _define_property({}, item.id, item));
+            });
+        });
+        Object.assign(data, _define_property({}, item.id, headersInstances));
+    }
+}
 export { Store };