@byteluck-fe/model-driven-core 2.6.0-alpha.4 → 2.6.0-alpha.5

package/dist/esm/api-doc-index.js

@@ -1,4 +1,4 @@
-export * from "./framework/index";
-export { default as BaseControlProperty } from "./common/BaseControl/property";
-export { default as ColumnControlProperty } from "./common/ColumnControl/property";
-export { default as FormControlProperty } from "./common/FormControl/property";
+export * from './framework/index';
+export { default as BaseControlProperty } from './common/BaseControl/property';
+export { default as ColumnControlProperty } from './common/ColumnControl/property';
+export { default as FormControlProperty } from './common/FormControl/property';

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

@@ -72,7 +72,7 @@ function _defineProperty(obj, key, value) {
 }
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
+        return right[Symbol.hasInstance](left);
     } else {
         return left instanceof right;
     }
@@ -102,7 +102,7 @@ function _objectSpread(target) {
     return target;
 }
 function _toArray(arr) {
-    return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 function _toConsumableArray(arr) {
     return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
@@ -115,105 +115,11 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
-var __generator = this && this.__generator || function(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g;
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-};
-import Property from "./property";
-import { genNonDuplicateId, JSONCopy, referenceError, updateValueFromKeys } from "@byteluck-fe/model-driven-shared";
-import { createValidator } from "../Validator";
-import { controlHooksEmitter } from "../controlHooksEmitter";
+import regeneratorRuntime from "regenerator-runtime";
+import Property from './property';
+import { genNonDuplicateId, JSONCopy, referenceError, updateValueFromKeys } from '@byteluck-fe/model-driven-shared';
+import { createValidator } from '../Validator';
+import { controlHooksEmitter } from '../controlHooksEmitter';
 var Control = /*#__PURE__*/ function _target() {
     "use strict";
     function Control(props) {
@@ -225,203 +131,29 @@ var Control = /*#__PURE__*/ function _target() {
         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;
+        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)) {
             referenceError("The ".concat(name, " controlName,controlIcon,controlType is not define"));
         }
-        var _props_id;
-        this.id = (_props_id = props === null || props === void 0 ? void 0 : props.id) !== null && _props_id !== void 0 ? _props_id : genNonDuplicateId(10);
+        var ref1;
+        this.id = (ref1 = props === null || props === void 0 ? void 0 : props.id) !== null && ref1 !== void 0 ? ref1 : genNonDuplicateId(10);
         this.name = controlName;
         this.icon = controlIcon;
-        var _props_type;
-        this.type = (_props_type = props === null || props === void 0 ? void 0 : props.type) !== null && _props_type !== void 0 ? _props_type : controlType;
+        var ref2;
+        this.type = (ref2 = props === null || props === void 0 ? void 0 : props.type) !== null && ref2 !== void 0 ? ref2 : controlType;
         this.props = new Property(props === null || props === void 0 ? void 0 : props.props, (_instanceof(this, Control) ? this.constructor : void 0).controlName);
-        var _props_controlType;
-        this.controlType = (_props_controlType = props === null || props === void 0 ? void 0 : props.controlType) !== null && _props_controlType !== void 0 ? _props_controlType : "base";
+        var ref3;
+        this.controlType = (ref3 = props === null || props === void 0 ? void 0 : props.controlType) !== null && ref3 !== void 0 ? ref3 : 'base';
         this.setting = JSONCopy(setting);
-        var _props_fieldType;
-        this.fieldType = (_props_fieldType = props === null || props === void 0 ? void 0 : props.fieldType) !== null && _props_fieldType !== void 0 ? _props_fieldType : controlFieldType;
+        var ref4;
+        this.fieldType = (ref4 = props === null || props === void 0 ? void 0 : props.fieldType) !== null && ref4 !== void 0 ? ref4 : controlFieldType;
         this.eventKeys = JSONCopy(controlEventKeys);
         this.customEvents = JSONCopy(controlCustomEvents);
         Promise.resolve().then(function() {
-            _this._callControlHooks("postInstance", props);
+            _this._callControlHooks('postInstance', props);
         });
     }
-    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
-                        ];
-                }
-            });
-        })();
-    };
-    // 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];
-                                }
-                            });
-                        }
-                        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;
-                        }
-                        throw err;
-                    case 5:
-                        return [
-                            2
-                        ];
-                }
-            });
-        })();
-    };
-    _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;
-                }
-                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: "rules",
@@ -432,22 +164,210 @@ var Control = /*#__PURE__*/ function _target() {
                 }
                 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 _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(regeneratorRuntime.mark(function _callee() {
+                    var rules, results, result;
+                    return regeneratorRuntime.wrap(function _callee$(_ctx) {
+                        while(1)switch(_ctx.prev = _ctx.next){
+                            case 0:
+                                rules = _objectSpread({}, _this.rules);
+                                _ctx.next = 3;
+                                return _this._callControlHooks('preValidate', rules);
+                            case 3:
+                                results = _ctx.sent;
+                                result = results[results.length - 1];
+                                return _ctx.abrupt("return", result === false ? undefined : result);
+                            case 6:
+                            case "end":
+                                return _ctx.stop();
+                        }
+                    }, _callee);
+                }))();
+            }
+        },
+        {
+            key: "validate",
+            value: // property校验
+            function validate(messages, ignore) {
+                var _this = this;
+                return _asyncToGenerator(regeneratorRuntime.mark(function _callee() {
+                    var result, rules, validator;
+                    return regeneratorRuntime.wrap(function _callee$(_ctx) {
+                        while(1)switch(_ctx.prev = _ctx.next){
+                            case 0:
+                                _ctx.next = 2;
+                                return _this.preValidate();
+                            case 2:
+                                result = _ctx.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);
+                                _ctx.prev = 6;
+                                _ctx.next = 9;
+                                return validator.validate(_this.props);
+                            case 9:
+                                return _ctx.abrupt("return", true);
+                            case 12:
+                                _ctx.prev = 12;
+                                _ctx.t0 = _ctx["catch"](6);
+                                if (!_ctx.t0.control) {
+                                    _ctx.t0.control = _this;
+                                }
+                                throw _ctx.t0;
+                            case 16:
+                            case "end":
+                                return _ctx.stop();
+                        }
+                    }, _callee, null, [
+                        [
+                            6,
+                            12
+                        ]
+                    ]);
+                }))();
+            }
+        },
+        {
+            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 _props = this.props, dataBind = _props.dataBind, datasourceBind = _props.datasourceBind, optionConfig = _props.optionConfig, caption = _props.caption, required = _props.required, maxLength = _props.maxLength, options = _props.options, encrypted = _props.encrypted, encryptedMode = _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;
+                        }
+                        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;
+            }
+        },
+        {
+            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
+                };
+            }
+        }
+    ], [
+        {
+            key: "updateBasicControl",
+            value: function updateBasicControl(key, setting) {
+                if (key !== 'setting') return;
+                if (setting.add) {
+                    var _setting;
+                    (_setting = this.setting).push.apply(_setting, _toConsumableArray(setting.add));
+                }
+                if (setting.remove) {
+                    this.removeSettingItem(setting.remove);
+                }
+                if (setting.update) {
+                // this.updateSettingItem(setting.update, false)
+                }
+            }
         }
     ]);
     return Control;
 }();
-Control.controlName = "控件";
-Control.controlIcon = "icon";
-Control.controlType = "control";
-// 控件可以触发的事件key
+Control.controlName = '控件';
+Control.controlIcon = 'icon';
+Control.controlType = 'control';
 Control.controlEventKeys = [];
 Control.controlCustomEvents = [];
-// setting应该是全量的设置项，外部控制，在初始化的时候会deepCopy一份
 Control.setting = [];
 Control.__is_control__ = true;
-// 删除指定的settingItem
 Control.removeSettingItem = removeSetting;
-// 修改指定的settingItem的visible
 Control.updateSettingItem = updateSetting;
 export default Control;
 export { Control as DesignerControl };
@@ -462,20 +382,20 @@ export { Control as DesignerControl };
     ];
     deleteKeys.forEach(function(deleteKey) {
         // 是否存在子项
-        var isHasItem = typeof deleteKey !== "string";
+        var isHasItem = typeof deleteKey !== 'string';
         // @ts-ignore
         var settingIndex = _this.setting.findIndex(function(option) {
             return option.key === (isHasItem ? deleteKey.key : deleteKey);
         });
         // 移除对应选项
         if (settingIndex !== -1) {
-            var _this_setting_settingIndex_showItems, _this_setting_settingIndex_showItems1;
-            isHasItem ? _this.setting[settingIndex].showItems = (_this_setting_settingIndex_showItems = _this.setting[settingIndex].showItems) === null || _this_setting_settingIndex_showItems === void 0 ? void 0 : _this_setting_settingIndex_showItems.filter(function(item) {
+            var ref, ref5;
+            isHasItem ? _this.setting[settingIndex].showItems = (ref = _this.setting[settingIndex].showItems) === null || ref === void 0 ? void 0 : ref.filter(function(item) {
                 return !deleteKey.hideItems.includes(item);
             }) : _this.setting.splice(settingIndex, 1);
             // 子项长度为0，自动移除当前设置项
             isHasItem && // @ts-ignore
-            !((_this_setting_settingIndex_showItems1 = _this.setting[settingIndex].showItems) === null || _this_setting_settingIndex_showItems1 === void 0 ? void 0 : _this_setting_settingIndex_showItems1.length) && // @ts-ignore
+            !((ref5 = _this.setting[settingIndex].showItems) === null || ref5 === void 0 ? void 0 : ref5.length) && // @ts-ignore
             _this.setting.splice(settingIndex, 1);
         }
     });
@@ -489,7 +409,7 @@ export { Control as DesignerControl };
  * @param value.type 默认是replace替换，可以更改为push新增
  * */ function updateSetting(settingKey, value) {
     var _this = this;
-    var keys = typeof settingKey === "string" ? [
+    var keys = typeof settingKey === 'string' ? [
         settingKey
     ] : settingKey;
     keys.forEach(function(key) {
@@ -498,16 +418,16 @@ export { Control as DesignerControl };
             return item.key === key;
         });
         if (settingItem) {
-            if (typeof value === "boolean") {
+            if (typeof value === 'boolean') {
                 settingItem.visible = value;
-            } else if (typeof value === "object") {
-                var _value_type;
-                var type = (_value_type = value.type) !== null && _value_type !== void 0 ? _value_type : "replace";
-                if (type === "replace") {
+            } else if (typeof value === 'object') {
+                var _type;
+                var type = (_type = value.type) !== null && _type !== void 0 ? _type : 'replace';
+                if (type === 'replace') {
                     settingItem.showItems = value.showItems;
                 } else {
-                    var _settingItem_showItems;
-                    (_settingItem_showItems = settingItem.showItems).push.apply(_settingItem_showItems, _toConsumableArray(value.showItems));
+                    var _showItems;
+                    (_showItems = settingItem.showItems).push.apply(_showItems, _toConsumableArray(value.showItems));
                 }
             }
         }

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

@@ -1,12 +1,12 @@
-import Designer from "./designer";
-import Runtime from "./runtime";
-import Property from "./property";
+import Designer from './designer';
+import Runtime from './runtime';
+import Property from './property';
 export default {
     Designer: Designer,
     Runtime: Runtime,
     Property: Property
 };
-export * from "./designer";
-export * from "./runtime";
-export * from "./property";
-export * from "./types";
+export * from './designer';
+export * from './runtime';
+export * from './property';
+export * from './types';