@byteluck-fe/model-driven-core 2.7.0-alpha.13 → 2.7.0-alpha.15a

package/dist/esm/common/WrapControl/runtime.js

@@ -9,19 +9,6 @@ function _classCallCheck(instance, Constructor) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
 function _getPrototypeOf(o) {
     _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
         return o.__proto__ || Object.getPrototypeOf(o);
@@ -82,18 +69,17 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import WrapControlProperty from "./property";
-import { RuntimeLayoutControl } from "../LayoutControl";
-var WrapControl = /*#__PURE__*/ function(RuntimeLayoutControl) {
+import WrapControlProperty from './property';
+import { RuntimeLayoutControl } from '../LayoutControl';
+var WrapControl = /*#__PURE__*/ function(RuntimeLayoutControl1) {
     "use strict";
-    _inherits(WrapControl, RuntimeLayoutControl);
+    _inherits(WrapControl, RuntimeLayoutControl1);
     var _super = _createSuper(WrapControl);
     function WrapControl(props) {
         _classCallCheck(this, WrapControl);
         var _this;
         _this = _super.call(this, props);
-        _defineProperty(_assertThisInitialized(_this), "controlType", "wrap");
-        _defineProperty(_assertThisInitialized(_this), "props", void 0);
+        _this.controlType = 'wrap';
         _this.props = new WrapControlProperty(props === null || props === void 0 ? void 0 : props.props);
         return _this;
     }

package/dist/esm/common/controlHooksEmitter.js

@@ -1,3 +1,3 @@
-import { Watcher } from "@byteluck-fe/model-driven-shared";
+import { Watcher } from '@byteluck-fe/model-driven-shared';
 var controlHooksEmitter = new Watcher();
 export { controlHooksEmitter };

package/dist/esm/common/index.js

@@ -1,12 +1,12 @@
-export * from "./BaseControl";
-export * from "./FormControl";
-export * from "./LayoutControl";
-export * from "./ListControl";
-export * from "./ColumnControl";
-export * from "./SearchViewControl";
-export * from "./WrapControl";
-export * from "./Validator";
-export * from "./ControlArray";
-export * from "./initOptionAndDataSourceRules";
-export * from "./initLinkOperationRules";
-export * from "./controlHooksEmitter";
+export * from './BaseControl';
+export * from './FormControl';
+export * from './LayoutControl';
+export * from './ListControl';
+export * from './ColumnControl';
+export * from './SearchViewControl';
+export * from './WrapControl';
+export * from './Validator';
+export * from './ControlArray';
+export * from './initOptionAndDataSourceRules';
+export * from './initLinkOperationRules';
+export * from './controlHooksEmitter';

package/dist/esm/common/initLinkOperationRules.js

@@ -1,17 +1,17 @@
-import { RulesMessage } from "@byteluck-fe/model-driven-shared";
+import { RulesMessage } from '@byteluck-fe/model-driven-shared';
 export function initLinkOperationRules(props) {
-    if (props.hasOwnProperty("linkOperationOption") && props.hasOwnProperty("showLinkOperation") && props.showLinkOperation) {
+    if (props.hasOwnProperty('linkOperationOption') && props.hasOwnProperty('showLinkOperation') && props.showLinkOperation) {
         this.linkOperationOption = [
             {
-                type: "object",
+                type: 'object',
                 fields: {
                     formKey: {
-                        type: "string",
+                        type: 'string',
                         required: true,
-                        message: RulesMessage.getMessage("pleaseEnterForm")
+                        message: RulesMessage.getMessage('pleaseEnterForm')
                     }
                 }
-            }
+            }, 
         ];
     }
 }

package/dist/esm/common/initOptionAndDataSourceRules.js

@@ -1,135 +1,135 @@
-import { getNotRepeatItems, RulesMessage } from "@byteluck-fe/model-driven-shared";
+import { getNotRepeatItems, RulesMessage } from '@byteluck-fe/model-driven-shared';
 export function initOptionAndDataSourceRules(props) {
-    if (!props.hasOwnProperty("optionConfig")) {
+    if (!props.hasOwnProperty('optionConfig')) {
         this.optionConfig = {
-            type: "any"
+            type: 'any'
         };
     }
-    if (!props.hasOwnProperty("options")) {
+    if (!props.hasOwnProperty('options')) {
         this.options = {
-            type: "any"
+            type: 'any'
         };
     }
-    if (!props.hasOwnProperty("datasourceBind")) {
+    if (!props.hasOwnProperty('datasourceBind')) {
         this.datasourceBind = {
-            type: "any"
+            type: 'any'
         };
     }
     // 有options属性，并且没有optionConfig或者有options并且optionConfig===custom
-    if (props.hasOwnProperty("options") && (!props.hasOwnProperty("optionConfig") || props.hasOwnProperty("optionConfig") && props.optionConfig === "custom")) {
+    if (props.hasOwnProperty('options') && (!props.hasOwnProperty('optionConfig') || props.hasOwnProperty('optionConfig') && props.optionConfig === 'custom')) {
         this.options = [
             {
-                type: "array",
-                message: RulesMessage.getMessage("isNotArray")
+                type: 'array',
+                message: RulesMessage.getMessage('isNotArray')
             },
             {
-                type: "array",
+                type: 'array',
                 defaultField: {
-                    type: "object",
+                    type: 'object',
                     fields: {
                         label: {
-                            type: "string",
+                            type: 'string',
                             required: true,
-                            message: RulesMessage.getMessage("pleaseEnterLabel")
+                            message: RulesMessage.getMessage('pleaseEnterLabel')
                         },
                         value: {
-                            type: "string",
+                            type: 'string',
                             required: true,
-                            message: RulesMessage.getMessage("pleaseEnterValue")
+                            message: RulesMessage.getMessage('pleaseEnterValue')
                         }
                     }
                 }
             },
             {
-                type: "array",
+                type: 'array',
                 validator: function validator(rule, value, callback) {
                     if (value.length === 0) {
-                        callback(RulesMessage.getMessage("optionIsRequired"));
+                        callback(RulesMessage.getMessage('optionIsRequired'));
                     }
                     callback();
                 }
             },
             {
-                type: "array",
+                type: 'array',
                 validator: function validator(rule, value, callback) {
                     var ids = value.map(function(item) {
                         return item.value;
                     });
                     var notRepeatIds = getNotRepeatItems(ids);
                     if (ids.length !== notRepeatIds.length) {
-                        callback(RulesMessage.getMessage("optionIdIsRepeat"));
+                        callback(RulesMessage.getMessage('optionIdIsRepeat'));
                     } else {
                         callback();
                     }
                 },
-                message: RulesMessage.getMessage("optionIdIsRepeat")
-            }
+                message: RulesMessage.getMessage('optionIdIsRepeat')
+            }, 
         ];
-    } else if (props.hasOwnProperty("datasourceBind") && (!props.hasOwnProperty("optionConfig") || props.hasOwnProperty("optionConfig") && props.optionConfig === "datasource")) {
+    } else if (props.hasOwnProperty('datasourceBind') && (!props.hasOwnProperty('optionConfig') || props.hasOwnProperty('optionConfig') && props.optionConfig === 'datasource')) {
         this.datasourceBind = [
             {
-                type: "object",
-                message: RulesMessage.getMessage("isNotObject")
+                type: 'object',
+                message: RulesMessage.getMessage('isNotObject')
             },
             {
-                type: "object",
+                type: 'object',
                 fields: {
                     dataCode: {
-                        type: "string",
+                        type: 'string',
                         required: true,
-                        message: RulesMessage.getMessage("pleaseEnterDataCode")
+                        message: RulesMessage.getMessage('pleaseEnterDataCode')
                     },
                     valueFieldCode: {
-                        type: "string",
+                        type: 'string',
                         required: true,
-                        message: RulesMessage.getMessage("pleaseEnterValueFieldCode")
+                        message: RulesMessage.getMessage('pleaseEnterValueFieldCode')
                     },
                     svcCode: {
-                        type: "string",
+                        type: 'string',
                         required: true,
-                        message: RulesMessage.getMessage("pleaseEnterSvcCode")
+                        message: RulesMessage.getMessage('pleaseEnterSvcCode')
                     },
                     displayBoList: [
                         {
-                            type: "array",
-                            message: RulesMessage.getMessage("isNotArray")
+                            type: 'array',
+                            message: RulesMessage.getMessage('isNotArray')
                         },
                         {
-                            type: "array",
+                            type: 'array',
                             validator: function validator(rule, value, callback) {
                                 if (value.length === 0) {
-                                    callback(RulesMessage.getMessage("pleaseBindAtLeastOneDisplayValue"));
+                                    callback(RulesMessage.getMessage('pleaseBindAtLeastOneDisplayValue'));
                                 }
                                 callback();
                             },
-                            message: RulesMessage.getMessage("pleaseBindAtLeastOneDisplayValue")
-                        }
+                            message: RulesMessage.getMessage('pleaseBindAtLeastOneDisplayValue')
+                        }, 
                     ],
                     orders: [
                         {
-                            type: "array",
-                            message: RulesMessage.getMessage("isNotArray")
+                            type: 'array',
+                            message: RulesMessage.getMessage('isNotArray')
                         },
                         {
-                            type: "array",
+                            type: 'array',
                             defaultField: {
-                                type: "object",
+                                type: 'object',
                                 fields: {
                                     columnName: {
-                                        type: "string",
+                                        type: 'string',
                                         required: true,
-                                        message: RulesMessage.getMessage("pleaseEnterFieldCode")
+                                        message: RulesMessage.getMessage('pleaseEnterFieldCode')
                                     },
                                     desc: {
-                                        type: "boolean",
-                                        message: RulesMessage.getMessage("isNotBoolean")
+                                        type: 'boolean',
+                                        message: RulesMessage.getMessage('isNotBoolean')
                                     }
                                 }
                             }
-                        }
+                        }, 
                     ]
                 }
-            }
+            }, 
         ];
     }
 }
@@ -137,91 +137,91 @@ export function initSuperDataSourceRules(props, attributes) {
     var messageInDataSetting = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     this.datasourceBind = [
         {
-            type: "object",
-            message: RulesMessage.getMessage("isNotObject")
+            type: 'object',
+            message: RulesMessage.getMessage('isNotObject')
         },
         {
-            type: "object",
+            type: 'object',
             fields: {
                 dataCode: {
-                    type: "string",
+                    type: 'string',
                     required: true,
-                    message: RulesMessage.getMessage(messageInDataSetting ? "pleaseEnterDataCodeInDataSetting" : "pleaseEnterDataCode")
+                    message: RulesMessage.getMessage(messageInDataSetting ? 'pleaseEnterDataCodeInDataSetting' : 'pleaseEnterDataCode')
                 },
                 valueFieldCode: {
-                    type: "string",
+                    type: 'string',
                     required: true,
-                    message: RulesMessage.getMessage(messageInDataSetting ? "pleaseEnterValueFieldCodeInDataSetting" : "pleaseEnterValueFieldCode")
+                    message: RulesMessage.getMessage(messageInDataSetting ? 'pleaseEnterValueFieldCodeInDataSetting' : 'pleaseEnterValueFieldCode')
                 },
                 svcCode: {
-                    type: "string",
+                    type: 'string',
                     required: true,
-                    message: RulesMessage.getMessage(messageInDataSetting ? "pleaseEnterSvcCodeInDataSetting" : "pleaseEnterSvcCode")
+                    message: RulesMessage.getMessage(messageInDataSetting ? 'pleaseEnterSvcCodeInDataSetting' : 'pleaseEnterSvcCode')
                 },
                 attributes: [
                     {
-                        type: "array",
-                        message: RulesMessage.getMessage("isNotArray")
+                        type: 'array',
+                        message: RulesMessage.getMessage('isNotArray')
                     },
                     {
-                        type: "array",
+                        type: 'array',
                         defaultField: {
-                            type: "object",
+                            type: 'object',
                             fields: {
                                 name: {
-                                    type: "string",
+                                    type: 'string',
                                     required: true,
-                                    message: RulesMessage.getMessage("isNotString")
+                                    message: RulesMessage.getMessage('isNotString')
                                 },
                                 key: {
-                                    type: "string",
+                                    type: 'string',
                                     required: true,
-                                    message: RulesMessage.getMessage("isNotString")
+                                    message: RulesMessage.getMessage('isNotString')
                                 },
                                 value: [
                                     {
-                                        type: "array",
-                                        message: RulesMessage.getMessage("isNotArray")
+                                        type: 'array',
+                                        message: RulesMessage.getMessage('isNotArray')
                                     },
                                     {
-                                        type: "array",
+                                        type: 'array',
                                         validator: function validator(rule, value, callback) {
                                             if (value.length === 0) {
-                                                callback(RulesMessage.getMessage(messageInDataSetting ? "pleaseBindAtLeastOneDisplayValueInDataSetting" : "pleaseBindAtLeastOneDisplayValue"));
+                                                callback(RulesMessage.getMessage(messageInDataSetting ? 'pleaseBindAtLeastOneDisplayValueInDataSetting' : 'pleaseBindAtLeastOneDisplayValue'));
                                             }
                                             callback();
                                         },
-                                        message: RulesMessage.getMessage(messageInDataSetting ? "pleaseBindAtLeastOneDisplayValueInDataSetting" : "pleaseBindAtLeastOneDisplayValue")
-                                    }
+                                        message: RulesMessage.getMessage(messageInDataSetting ? 'pleaseBindAtLeastOneDisplayValueInDataSetting' : 'pleaseBindAtLeastOneDisplayValue')
+                                    }, 
                                 ]
                             }
                         }
-                    }
+                    }, 
                 ],
                 orders: [
                     {
-                        type: "array",
-                        message: RulesMessage.getMessage("isNotArray")
+                        type: 'array',
+                        message: RulesMessage.getMessage('isNotArray')
                     },
                     {
-                        type: "array",
+                        type: 'array',
                         defaultField: {
-                            type: "object",
+                            type: 'object',
                             fields: {
                                 columnName: {
-                                    type: "string",
+                                    type: 'string',
                                     required: true,
-                                    message: RulesMessage.getMessage("pleaseEnterFieldCode")
+                                    message: RulesMessage.getMessage('pleaseEnterFieldCode')
                                 },
                                 desc: {
-                                    type: "boolean",
-                                    message: RulesMessage.getMessage("isNotBoolean")
+                                    type: 'boolean',
+                                    message: RulesMessage.getMessage('isNotBoolean')
                                 }
                             }
                         }
-                    }
+                    }, 
                 ]
             }
-        }
+        }, 
     ];
 }

package/dist/esm/framework/RegisterControls.js

@@ -17,29 +17,16 @@ function _createClass(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-import { error, CONTROL_BASE_TYPE, warn } from "@byteluck-fe/model-driven-shared";
+import { error, CONTROL_BASE_TYPE, warn } from '@byteluck-fe/model-driven-shared';
+import { setPropertyDontEnum } from "../common/ControlArray";
 var baseStaticControls = [];
 export var RegisterControls = /*#__PURE__*/ function() {
     "use strict";
     function RegisterControls(type) {
         _classCallCheck(this, RegisterControls);
-        _defineProperty(this, "registeredControlTypes", new Set());
-        _defineProperty(this, "controlConfigMap", new Map());
-        _defineProperty(this, "_controls", []);
-        _defineProperty(this, "_type", void 0);
+        this.registeredControlTypes = new Set();
+        this.controlConfigMap = new Map();
+        this._controls = [];
         this._type = type;
         this._initControls(type);
     }
@@ -116,38 +103,41 @@ export var RegisterControls = /*#__PURE__*/ function() {
         {
             key: "createControl",
             value: function createControl(schema, beforeCreateInstance) {
-                var _this = this;
                 if (Array.isArray(schema)) {
+                    var _this = this;
                     return schema.map(function(item) {
                         return _this.createControl(item, beforeCreateInstance);
                     });
                 }
                 // @ts-ignore
                 if (schema.children) {
+                    var _this1 = this;
                     // @ts-ignore
                     schema.children = schema.children.map(function(item) {
-                        return _this.createControl(item, beforeCreateInstance);
+                        return _this1.createControl(item, beforeCreateInstance);
                     });
                 }
                 if (this.isListControl(schema)) {
                     // @ts-ignore
                     var props = schema.props;
                     if (props.headers) {
+                        var _this2 = this;
                         // @ts-ignore
                         props.headers = props.headers.map(function(item) {
-                            return(// @ts-ignore
-                            _this.createControl(item, beforeCreateInstance));
+                            // @ts-ignore
+                            return _this2.createControl(item, beforeCreateInstance);
                         });
                     }
                     // list类型的控件，允许存在footer
                     if (props.footers) {
+                        var _this3 = this;
                         // @ts-ignore
                         props.footers = props.footers.map(function(item) {
                             var newctl;
                             // footers 允许有空存在
                             if (item) {
                                 // @ts-ignore
-                                newctl = _this.createControl(item, beforeCreateInstance);
+                                newctl = _this3.createControl(item, beforeCreateInstance);
                             }
                             return newctl;
                         });
@@ -158,15 +148,21 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 if (Constructor) {
                     // @ts-ignore
                     var createSchema = schema;
-                    if (typeof beforeCreateInstance === "function") {
+                    if (typeof beforeCreateInstance === 'function') {
                         var result = beforeCreateInstance(createSchema);
                         if (result) {
                             createSchema = result;
                         }
                     }
-                    // @ts-ignore
-                    var control = new Constructor(createSchema);
-                    // this.defineParentToChildren(control)
+                    var control;
+                    if (Constructor.mode === 'Runtime') {
+                        control = createSchema;
+                        // this.defineParentToChildren(control)
+                        this._setParentPrototypeToSchema(control, this);
+                    } else {
+                        // @ts-ignore
+                        control = new Constructor(createSchema);
+                    }
                     return control;
                 } else {
                     error(// @ts-ignore
@@ -174,6 +170,45 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "_setParentPrototypeToSchema",
+            value: function _setParentPrototypeToSchema(schema, runtime) {
+                // if (Reflect.has(schema, 'parent')) {
+                //   return
+                // }
+                if (runtime._type !== 'Runtime') {
+                    return;
+                }
+                Object.defineProperty(schema, 'parent', {
+                    get: function get() {
+                        // @ts-ignore
+                        var id = schema.id;
+                        var controlParentIdMap = runtime._controlParentIdMap;
+                        var instanceMap = runtime.instanceMap;
+                        if (!controlParentIdMap || !instanceMap) {
+                            return;
+                        }
+                        var parentId = controlParentIdMap[id];
+                        var selfInInstances = instanceMap[id];
+                        if (!parentId && !selfInInstances) {
+                            return;
+                        }
+                        var selfIndex = selfInInstances.findIndex(function(item) {
+                            return item == schema;
+                        });
+                        var parentInstances = instanceMap[parentId] || [];
+                        var parentInstance;
+                        if (parentInstances.length !== selfInInstances.length) {
+                            parentInstance = parentInstances[0];
+                        } else {
+                            parentInstance = parentInstances[selfIndex];
+                        }
+                        return parentInstance;
+                    }
+                });
+                setPropertyDontEnum(schema, 'parent');
+            }
+        },
         {
             key: "createControlInstance",
             value: function createControlInstance(type, initSchema) {
@@ -201,14 +236,28 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 var _this = this;
                 this.constructor.staticControls.forEach(function(item) {
                     _this.register(item[type]);
+                    RegisterControls.staticControlsRuntimeRules.set(item.Runtime.controlType, item.Property.RuntimeRules);
+                    item.Property.mode = type;
                 });
             }
         }
     ], [
+        {
+            key: "staticGetRules",
+            value: function staticGetRules(controlType, props) {
+                var Rules = RegisterControls.staticControlsRuntimeRules.get(controlType);
+                var result = [];
+                if (Rules) {
+                    var rules = new Rules(props);
+                    result = Array.from(rules);
+                }
+                return result;
+            }
+        },
         {
             key: "register",
-            value: function register(control) {
-                var Designer = control.Designer, Runtime = control.Runtime;
+            value: function register(control, mode) {
+                var Designer = control.Designer, Runtime = control.Runtime, Property = control.Property;
                 if (!Designer || !Runtime || !Designer.__is_control__ || !Runtime.__is_control__) {
                     error("".concat(control, " is can't register as a Control"));
                 }
@@ -221,14 +270,16 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 }
                 this.staticRegisteredTypes.add(Designer.controlType);
                 this.staticControls.push(control);
+                Property.mode = mode;
                 return this;
             }
         }
     ]);
     return RegisterControls;
 }();
-_defineProperty(RegisterControls, "staticControls", baseStaticControls);
-_defineProperty(RegisterControls, "staticRegisteredTypes", new Set(baseStaticControls.map(function(item) {
+RegisterControls.staticControlsRuntimeRules = new Map();
+RegisterControls.staticControls = baseStaticControls;
+RegisterControls.staticRegisteredTypes = new Set(baseStaticControls.map(function(item) {
     return item.Designer.controlType;
-})));
-_defineProperty(RegisterControls, "staticRegisteredConfigs", new Map());
+}));
+RegisterControls.staticRegisteredConfigs = new Map();