@byteluck-fe/model-driven-core 2.5.0-alpha.6 → 2.6.0-alpha.1

package/dist/esm/common/BaseControl/designer.js

@@ -219,20 +219,12 @@ var Control = /*#__PURE__*/ function _target() {
     function Control(props) {
         var _this = this;
         _classCallCheck(this, Control);
-        _defineProperty(this, "id", void 0 // 唯一标识符
-        );
-        _defineProperty(this, "name", void 0);
-        _defineProperty(this, "icon", void 0);
-        _defineProperty(this, "type", void 0);
-        _defineProperty(this, "controlType", void 0);
-        _defineProperty(this, "props", void 0);
-        _defineProperty(this, "setting", []);
-        _defineProperty(this, "fieldType", void 0);
-        _defineProperty(this, "eventKeys", []);
-        _defineProperty(this, "customEvents", []);
-        _defineProperty(this, "parent", null);
-        _defineProperty(this, "updateSetting", updateSetting);
-        _defineProperty(this, "removeSetting", removeSetting);
+        this.setting = [];
+        this.eventKeys = [];
+        this.customEvents = [];
+        this.parent = null;
+        this.updateSetting = updateSetting;
+        this.removeSetting = removeSetting;
         this._callControlHooks("preInstance", props);
         var _ref = _instanceof(this, Control) ? this.constructor : void 0, controlName = _ref.controlName, controlIcon = _ref.controlIcon, controlType = _ref.controlType, controlFieldType = _ref.controlFieldType, controlEventKeys = _ref.controlEventKeys, controlCustomEvents = _ref.controlCustomEvents, name = _ref.name, setting = _ref.setting;
         if (!(controlName && controlIcon && controlType)) {
@@ -256,238 +248,207 @@ var Control = /*#__PURE__*/ function _target() {
             _this._callControlHooks("postInstance", props);
         });
     }
-    _createClass(Control, [
-        {
-            key: "rules",
-            get: function get() {
-                var Rules = this.props.constructor.Rules;
-                if (Rules) {
-                    return new Rules(this.props);
-                }
-                return {};
-            }
-        },
-        {
-            key: "_callControlHooks",
-            value: function _callControlHooks() {
-                for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
-                    args[_key] = arguments[_key];
+    var _proto = Control.prototype;
+    _proto._callControlHooks = function _callControlHooks() {
+        for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
+            args[_key] = arguments[_key];
+        }
+        var _controlHooksEmitter;
+        var _args = _toArray(args), key = _args[0], arg = _args.slice(1);
+        return (_controlHooksEmitter = controlHooksEmitter).emit.apply(_controlHooksEmitter, [
+            key,
+            this
+        ].concat(_toConsumableArray(arg)));
+    };
+    _proto.preUpdate = function preUpdate(key, value) {
+        // 在修改props之前
+        this._callControlHooks("preUpdateProps", key, value);
+    };
+    _proto.postUpdate = function postUpdate(key, value) {
+        // 在修改props之后
+        this._callControlHooks("postUpdateProps", key, value);
+    };
+    // 修改实例上的props，key可以是caption,caption.zh...
+    _proto.updateProps = function updateProps(key, value) {
+        this.preUpdate(key, value);
+        updateValueFromKeys(this.props, key, value);
+        this.postUpdate(key, value);
+    };
+    _proto.preValidate = function preValidate() {
+        var _this = this;
+        return _asyncToGenerator(function() {
+            var rules, results, result;
+            return __generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        rules = _objectSpread({}, _this.rules);
+                        return [
+                            4,
+                            _this._callControlHooks("preValidate", rules)
+                        ];
+                    case 1:
+                        results = _state.sent();
+                        result = results[results.length - 1];
+                        return [
+                            2,
+                            result === false ? undefined : result
+                        ];
                 }
-                var _controlHooksEmitter;
-                var _args = _toArray(args), key = _args[0], arg = _args.slice(1);
-                return (_controlHooksEmitter = controlHooksEmitter).emit.apply(_controlHooksEmitter, [
-                    key,
-                    this
-                ].concat(_toConsumableArray(arg)));
-            }
-        },
-        {
-            key: "preUpdate",
-            value: function preUpdate(key, value) {
-                // 在修改props之前
-                this._callControlHooks("preUpdateProps", key, value);
-            }
-        },
-        {
-            key: "postUpdate",
-            value: function postUpdate(key, value) {
-                // 在修改props之后
-                this._callControlHooks("postUpdateProps", key, value);
-            }
-        },
-        {
-            key: "updateProps",
-            value: // 修改实例上的props，key可以是caption,caption.zh...
-            function updateProps(key, value) {
-                this.preUpdate(key, value);
-                updateValueFromKeys(this.props, key, value);
-                this.postUpdate(key, value);
-            }
-        },
-        {
-            key: "preValidate",
-            value: function preValidate() {
-                var _this = this;
-                return _asyncToGenerator(function() {
-                    var rules, results, result;
-                    return __generator(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                rules = _objectSpread({}, _this.rules);
-                                return [
-                                    4,
-                                    _this._callControlHooks("preValidate", rules)
-                                ];
-                            case 1:
-                                results = _state.sent();
-                                result = results[results.length - 1];
-                                return [
-                                    2,
-                                    result === false ? undefined : result
-                                ];
-                        }
-                    });
-                })();
-            }
-        },
-        {
-            key: "validate",
-            value: // property校验
-            function validate(messages, ignore) {
-                var _this = this;
-                return _asyncToGenerator(function() {
-                    var result, rules, validator, err;
-                    return __generator(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                return [
-                                    4,
-                                    _this.preValidate()
-                                ];
-                            case 1:
-                                result = _state.sent();
-                                rules = result !== undefined ? result : _objectSpread({}, _this.rules);
-                                if (Array.isArray(ignore)) {
-                                    ignore.forEach(function(key) {
-                                        if (rules.hasOwnProperty(key)) {
-                                            delete rules[key];
-                                        }
-                                    });
-                                }
-                                validator = createValidator(rules, messages);
-                                _state.label = 2;
-                            case 2:
-                                _state.trys.push([
-                                    2,
-                                    4,
-                                    ,
-                                    5
-                                ]);
-                                return [
-                                    4,
-                                    validator.validate(_this.props)
-                                ];
-                            case 3:
-                                _state.sent();
-                                return [
-                                    2,
-                                    true
-                                ];
-                            case 4:
-                                err = _state.sent();
-                                if (!err.control) {
-                                    err.control = _this;
+            });
+        })();
+    };
+    // property校验
+    _proto.validate = function validate(messages, ignore) {
+        var _this = this;
+        return _asyncToGenerator(function() {
+            var result, rules, validator, err;
+            return __generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            _this.preValidate()
+                        ];
+                    case 1:
+                        result = _state.sent();
+                        rules = result !== undefined ? result : _objectSpread({}, _this.rules);
+                        if (Array.isArray(ignore)) {
+                            ignore.forEach(function(key) {
+                                if (rules.hasOwnProperty(key)) {
+                                    delete rules[key];
                                 }
-                                throw err;
-                            case 5:
-                                return [
-                                    2
-                                ];
+                            });
                         }
-                    });
-                })();
-            }
-        },
-        {
-            key: "toDataBindModel",
-            value: function toDataBindModel() {
-                var parentId = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
-                var fieldType = this.fieldType;
-                var controlId = this.id;
-                var type = this.type;
-                var _this_props = this.props, dataBind = _this_props.dataBind, datasourceBind = _this_props.datasourceBind, optionConfig = _this_props.optionConfig, caption = _this_props.caption, required = _this_props.required, maxLength = _this_props.maxLength, options = _this_props.options, encrypted = _this_props.encrypted, encryptedMode = _this_props.encryptedMode;
-                if (!fieldType && !dataBind && !datasourceBind) return;
-                var dataBindModelType = {
-                    parentId: parentId,
-                    fieldType: fieldType,
-                    controlId: controlId,
-                    caption: caption,
-                    type: type,
-                    props: {}
-                };
-                if (dataBind) {
-                    dataBindModelType.dataBind = dataBind;
-                }
-                switch(optionConfig){
-                    case "datasource":
-                    case undefined:
-                        if (datasourceBind) {
-                            dataBindModelType.datasourceBind = datasourceBind;
+                        validator = createValidator(rules, messages);
+                        _state.label = 2;
+                    case 2:
+                        _state.trys.push([
+                            2,
+                            4,
+                            ,
+                            5
+                        ]);
+                        return [
+                            4,
+                            validator.validate(_this.props)
+                        ];
+                    case 3:
+                        _state.sent();
+                        return [
+                            2,
+                            true
+                        ];
+                    case 4:
+                        err = _state.sent();
+                        if (!err.control) {
+                            err.control = _this;
                         }
-                        break;
-                    case "custom":
-                        dataBindModelType.props.options = options;
-                        break;
-                }
-                if (required !== undefined) {
-                    dataBindModelType.required = required;
+                        throw err;
+                    case 5:
+                        return [
+                            2
+                        ];
                 }
-                if (maxLength !== undefined) {
-                    dataBindModelType.maxLength = maxLength;
-                }
-                if (encrypted !== undefined) {
-                    dataBindModelType.encrypted = encrypted;
-                }
-                if (encryptedMode !== undefined) {
-                    dataBindModelType.encryptedMode = encryptedMode;
+            });
+        })();
+    };
+    _proto.toDataBindModel = function toDataBindModel() {
+        var parentId = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
+        var fieldType = this.fieldType;
+        var controlId = this.id;
+        var type = this.type;
+        var _this_props = this.props, dataBind = _this_props.dataBind, datasourceBind = _this_props.datasourceBind, optionConfig = _this_props.optionConfig, caption = _this_props.caption, required = _this_props.required, maxLength = _this_props.maxLength, options = _this_props.options, encrypted = _this_props.encrypted, encryptedMode = _this_props.encryptedMode;
+        if (!fieldType && !dataBind && !datasourceBind) return;
+        var dataBindModelType = {
+            parentId: parentId,
+            fieldType: fieldType,
+            controlId: controlId,
+            caption: caption,
+            type: type,
+            props: {}
+        };
+        if (dataBind) {
+            dataBindModelType.dataBind = dataBind;
+        }
+        switch(optionConfig){
+            case "datasource":
+            case undefined:
+                if (datasourceBind) {
+                    dataBindModelType.datasourceBind = datasourceBind;
                 }
-                return dataBindModelType;
-            }
-        },
-        {
-            key: "preToSchema",
-            value: function preToSchema() {
-                // 在处理Schema之前，预留的钩子函数，允许在toSchema之前处理一些数据
-                this._callControlHooks("preToSchema", this);
-            }
-        },
-        {
-            key: "toSchema",
-            value: function toSchema() {
-                this.preToSchema();
-                return {
-                    id: this.id,
-                    type: this.type,
-                    props: JSONCopy(this.props),
-                    fieldType: this.fieldType,
-                    controlType: this.controlType
-                };
-            }
+                break;
+            case "custom":
+                dataBindModelType.props.options = options;
+                break;
+        }
+        if (required !== undefined) {
+            dataBindModelType.required = required;
+        }
+        if (maxLength !== undefined) {
+            dataBindModelType.maxLength = maxLength;
+        }
+        if (encrypted !== undefined) {
+            dataBindModelType.encrypted = encrypted;
         }
-    ], [
+        if (encryptedMode !== undefined) {
+            dataBindModelType.encryptedMode = encryptedMode;
+        }
+        return dataBindModelType;
+    };
+    _proto.preToSchema = function preToSchema() {
+        // 在处理Schema之前，预留的钩子函数，允许在toSchema之前处理一些数据
+        this._callControlHooks("preToSchema", this);
+    };
+    _proto.toSchema = function toSchema() {
+        this.preToSchema();
+        return {
+            id: this.id,
+            type: this.type,
+            props: JSONCopy(this.props),
+            fieldType: this.fieldType,
+            controlType: this.controlType
+        };
+    };
+    Control.updateBasicControl = function updateBasicControl(key, setting) {
+        if (key !== "setting") return;
+        if (setting.add) {
+            var _this_setting;
+            (_this_setting = this.setting).push.apply(_this_setting, _toConsumableArray(setting.add));
+        }
+        if (setting.remove) {
+            this.removeSettingItem(setting.remove);
+        }
+        if (setting.update) {
+        // this.updateSettingItem(setting.update, false)
+        }
+    };
+    _createClass(Control, [
         {
-            key: "updateBasicControl",
-            value: function updateBasicControl(key, setting) {
-                if (key !== "setting") return;
-                if (setting.add) {
-                    var _this_setting;
-                    (_this_setting = this.setting).push.apply(_this_setting, _toConsumableArray(setting.add));
-                }
-                if (setting.remove) {
-                    this.removeSettingItem(setting.remove);
-                }
-                if (setting.update) {
-                // this.updateSettingItem(setting.update, false)
+            key: "rules",
+            get: function get() {
+                var Rules = this.props.constructor.Rules;
+                if (Rules) {
+                    return new Rules(this.props);
                 }
+                return {};
             }
         }
     ]);
     return Control;
 }();
-_defineProperty(Control, "controlName", "控件");
-_defineProperty(Control, "controlIcon", "icon");
-_defineProperty(Control, "controlType", "control");
-_defineProperty(Control, "controlFieldType", void 0);
+Control.controlName = "控件";
+Control.controlIcon = "icon";
+Control.controlType = "control";
 // 控件可以触发的事件key
-_defineProperty(Control, "controlEventKeys", []);
-_defineProperty(Control, "controlCustomEvents", []);
+Control.controlEventKeys = [];
+Control.controlCustomEvents = [];
 // setting应该是全量的设置项，外部控制，在初始化的时候会deepCopy一份
-_defineProperty(Control, "setting", []);
-_defineProperty(Control, "__is_control__", true);
+Control.setting = [];
+Control.__is_control__ = true;
 // 删除指定的settingItem
-_defineProperty(Control, "removeSettingItem", removeSetting);
+Control.removeSettingItem = removeSetting;
 // 修改指定的settingItem的visible
-_defineProperty(Control, "updateSettingItem", updateSetting);
+Control.updateSettingItem = updateSetting;
 export default Control;
 export { Control as DesignerControl };
 /**

package/dist/esm/common/BaseControl/property.js

@@ -37,19 +37,6 @@ function _construct(Parent, args, Class) {
     }
     return _construct.apply(null, arguments);
 }
-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);
@@ -143,9 +130,9 @@ import { BaseStyle } from "../../framework";
 var PropertyRules = function PropertyRules(props) {
     "use strict";
     _classCallCheck(this, PropertyRules);
-    _defineProperty(this, "isHide", {
+    this.isHide = {
         type: "boolean"
-    });
+    };
 };
 var PropertyRuntimeRules = /*#__PURE__*/ function(Array1) {
     "use strict";
@@ -161,17 +148,13 @@ var Property = function Property(props) {
     "use strict";
     var caption = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
     _classCallCheck(this, Property);
-    _defineProperty(this, "isHide", void 0);
-    _defineProperty(this, "className", void 0);
-    _defineProperty(this, "style", void 0);
-    _defineProperty(this, "caption", void 0);
     var _props_isHide;
     this.isHide = (_props_isHide = props === null || props === void 0 ? void 0 : props.isHide) !== null && _props_isHide !== void 0 ? _props_isHide : false;
     this.style = new BaseStyle(props === null || props === void 0 ? void 0 : props.style);
     var _props_caption;
     this.caption = (_props_caption = props === null || props === void 0 ? void 0 : props.caption) !== null && _props_caption !== void 0 ? _props_caption : caption;
 };
-_defineProperty(Property, "Rules", PropertyRules);
-_defineProperty(Property, "RuntimeRules", PropertyRuntimeRules);
+Property.Rules = PropertyRules;
+Property.RuntimeRules = PropertyRuntimeRules;
 export default Property;
 export { Property, PropertyRules, PropertyRuntimeRules };

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

@@ -17,19 +17,6 @@ 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;
-}
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
@@ -44,15 +31,8 @@ var Control = /*#__PURE__*/ function _target() {
     "use strict";
     function Control(props) {
         _classCallCheck(this, Control);
-        _defineProperty(this, "id", void 0 // 唯一标识符
-        );
-        _defineProperty(this, "type", void 0);
-        _defineProperty(this, "controlType", void 0);
-        _defineProperty(this, "props", void 0);
-        _defineProperty(this, "fieldType", void 0);
-        _defineProperty(this, "customEvents", []);
-        _defineProperty(this, "pageStatus", void 0);
-        _defineProperty(this, "parent", null);
+        this.customEvents = [];
+        this.parent = null;
         var _ref = _instanceof(this, Control) ? this.constructor : void 0, controlType = _ref.controlType, controlFieldType = _ref.controlFieldType, name = _ref.name, controlCustomEvents = _ref.controlCustomEvents;
         if (!controlType) {
             referenceError("The ".concat(name, " controlType is not define"));
@@ -85,9 +65,8 @@ var Control = /*#__PURE__*/ function _target() {
     ]);
     return Control;
 }();
-_defineProperty(Control, "controlType", "control");
-_defineProperty(Control, "controlFieldType", void 0);
-_defineProperty(Control, "__is_control__", true);
-_defineProperty(Control, "controlCustomEvents", []);
+Control.controlType = "control";
+Control.__is_control__ = true;
+Control.controlCustomEvents = [];
 export default Control;
 export { Control as RuntimeControl };

package/dist/esm/common/ColumnControl/designer.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);
@@ -92,8 +79,7 @@ var ColumnControl = /*#__PURE__*/ function(DesignerControl) {
         _classCallCheck(this, ColumnControl);
         var _this;
         _this = _super.call(this, props);
-        _defineProperty(_assertThisInitialized(_this), "controlType", "column");
-        _defineProperty(_assertThisInitialized(_this), "props", void 0);
+        _this.controlType = "column";
         _this.props = new ColumnControlProperty(props === null || props === void 0 ? void 0 : props.props);
         return _this;
     }