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

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,145 +115,43 @@ 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) {
         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._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.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)) {
             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);
         });
     }
     _createClass(Control, [
@@ -285,14 +183,14 @@ var Control = /*#__PURE__*/ function _target() {
             key: "preUpdate",
             value: function preUpdate(key, value) {
                 // 在修改props之前
-                this._callControlHooks("preUpdateProps", key, value);
+                this._callControlHooks('preUpdateProps', key, value);
             }
         },
         {
             key: "postUpdate",
             value: function postUpdate(key, value) {
                 // 在修改props之后
-                this._callControlHooks("postUpdateProps", key, value);
+                this._callControlHooks('postUpdateProps', key, value);
             }
         },
         {
@@ -308,26 +206,24 @@ var Control = /*#__PURE__*/ function _target() {
             key: "preValidate",
             value: function preValidate() {
                 var _this = this;
-                return _asyncToGenerator(function() {
+                return _asyncToGenerator(regeneratorRuntime.mark(function _callee() {
                     var rules, results, result;
-                    return __generator(this, function(_state) {
-                        switch(_state.label){
+                    return regeneratorRuntime.wrap(function _callee$(_ctx) {
+                        while(1)switch(_ctx.prev = _ctx.next){
                             case 0:
                                 rules = _objectSpread({}, _this.rules);
-                                return [
-                                    4,
-                                    _this._callControlHooks("preValidate", rules)
-                                ];
-                            case 1:
-                                results = _state.sent();
+                                _ctx.next = 3;
+                                return _this._callControlHooks('preValidate', rules);
+                            case 3:
+                                results = _ctx.sent;
                                 result = results[results.length - 1];
-                                return [
-                                    2,
-                                    result === false ? undefined : result
-                                ];
+                                return _ctx.abrupt("return", result === false ? undefined : result);
+                            case 6:
+                            case "end":
+                                return _ctx.stop();
                         }
-                    });
-                })();
+                    }, _callee);
+                }))();
             }
         },
         {
@@ -335,17 +231,15 @@ var Control = /*#__PURE__*/ function _target() {
             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){
+                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:
-                                return [
-                                    4,
-                                    _this.preValidate()
-                                ];
-                            case 1:
-                                result = _state.sent();
+                                _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) {
@@ -355,37 +249,29 @@ var Control = /*#__PURE__*/ function _target() {
                                     });
                                 }
                                 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;
+                                _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 err;
-                            case 5:
-                                return [
-                                    2
-                                ];
+                                throw _ctx.t0;
+                            case 16:
+                            case "end":
+                                return _ctx.stop();
                         }
-                    });
-                })();
+                    }, _callee, null, [
+                        [
+                            6,
+                            12
+                        ]
+                    ]);
+                }))();
             }
         },
         {
@@ -395,7 +281,7 @@ var Control = /*#__PURE__*/ function _target() {
                 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;
+                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,
@@ -409,13 +295,13 @@ var Control = /*#__PURE__*/ function _target() {
                     dataBindModelType.dataBind = dataBind;
                 }
                 switch(optionConfig){
-                    case "datasource":
+                    case 'datasource':
                     case undefined:
                         if (datasourceBind) {
                             dataBindModelType.datasourceBind = datasourceBind;
                         }
                         break;
-                    case "custom":
+                    case 'custom':
                         dataBindModelType.props.options = options;
                         break;
                 }
@@ -438,7 +324,7 @@ var Control = /*#__PURE__*/ function _target() {
             key: "preToSchema",
             value: function preToSchema() {
                 // 在处理Schema之前，预留的钩子函数，允许在toSchema之前处理一些数据
-                this._callControlHooks("preToSchema", this);
+                this._callControlHooks('preToSchema', this);
             }
         },
         {
@@ -458,10 +344,10 @@ var Control = /*#__PURE__*/ function _target() {
         {
             key: "updateBasicControl",
             value: function updateBasicControl(key, setting) {
-                if (key !== "setting") return;
+                if (key !== 'setting') return;
                 if (setting.add) {
-                    var _this_setting;
-                    (_this_setting = this.setting).push.apply(_this_setting, _toConsumableArray(setting.add));
+                    var _setting;
+                    (_setting = this.setting).push.apply(_setting, _toConsumableArray(setting.add));
                 }
                 if (setting.remove) {
                     this.removeSettingItem(setting.remove);
@@ -474,20 +360,15 @@ var Control = /*#__PURE__*/ function _target() {
     ]);
     return Control;
 }();
-_defineProperty(Control, "controlName", "控件");
-_defineProperty(Control, "controlIcon", "icon");
-_defineProperty(Control, "controlType", "control");
-_defineProperty(Control, "controlFieldType", void 0);
-// 控件可以触发的事件key
-_defineProperty(Control, "controlEventKeys", []);
-_defineProperty(Control, "controlCustomEvents", []);
-// setting应该是全量的设置项，外部控制，在初始化的时候会deepCopy一份
-_defineProperty(Control, "setting", []);
-_defineProperty(Control, "__is_control__", true);
-// 删除指定的settingItem
-_defineProperty(Control, "removeSettingItem", removeSetting);
-// 修改指定的settingItem的visible
-_defineProperty(Control, "updateSettingItem", updateSetting);
+Control.controlName = '控件';
+Control.controlIcon = 'icon';
+Control.controlType = 'control';
+Control.controlEventKeys = [];
+Control.controlCustomEvents = [];
+Control.setting = [];
+Control.__is_control__ = true;
+Control.removeSettingItem = removeSetting;
+Control.updateSettingItem = updateSetting;
 export default Control;
 export { Control as DesignerControl };
 /**
@@ -500,23 +381,23 @@ export { Control as DesignerControl };
         keys
     ];
     deleteKeys.forEach(function(deleteKey) {
-        var _this_setting;
+        var ref;
         // 是否存在子项
-        var isHasItem = typeof deleteKey !== "string";
+        var isHasItem = typeof deleteKey !== 'string';
         // 判断setting是否是自定义控件setting项
         // @ts-ignore
-        var settingIndex = (_this_setting = _this.setting) === null || _this_setting === void 0 ? void 0 : _this_setting.findIndex(function(option) {
+        var settingIndex = (ref = _this.setting) === null || ref === void 0 ? void 0 : ref.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 ref5, ref6;
+            isHasItem ? _this.setting[settingIndex].showItems = (ref5 = _this.setting[settingIndex].showItems) === null || ref5 === void 0 ? void 0 : ref5.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
+            !((ref6 = _this.setting[settingIndex].showItems) === null || ref6 === void 0 ? void 0 : ref6.length) && // @ts-ignore
             _this.setting.splice(settingIndex, 1);
         }
     });
@@ -530,7 +411,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) {
@@ -539,16 +420,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';

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);
@@ -139,17 +126,17 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import { BaseStyle } from "../../framework";
+import { BaseStyle } from '../../framework';
 var PropertyRules = function PropertyRules(props) {
     "use strict";
     _classCallCheck(this, PropertyRules);
-    _defineProperty(this, "isHide", {
-        type: "boolean"
-    });
+    this.isHide = {
+        type: 'boolean'
+    };
 };
-var PropertyRuntimeRules = /*#__PURE__*/ function(Array1) {
+var PropertyRuntimeRules = /*#__PURE__*/ function(Array) {
     "use strict";
-    _inherits(PropertyRuntimeRules, Array1);
+    _inherits(PropertyRuntimeRules, Array);
     var _super = _createSuper(PropertyRuntimeRules);
     function PropertyRuntimeRules(props) {
         _classCallCheck(this, PropertyRuntimeRules);
@@ -157,32 +144,17 @@ var PropertyRuntimeRules = /*#__PURE__*/ function(Array1) {
     }
     return PropertyRuntimeRules;
 }(_wrapNativeSuper(Array));
-/**
- * 全局属性
- * @public
- */ var Property = function Property(props) {
+var Property = function Property(props) {
     "use strict";
-    var caption = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+    var caption = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
     _classCallCheck(this, Property);
-    /**
-   * 是否隐藏
-   * @public
-   * @defaultValue false
-   */ _defineProperty(this, "isHide", void 0);
-    _defineProperty(this, "className", void 0);
-    _defineProperty(this, "style", void 0);
-    /**
-   * 标题
-   * @public
-   * @defaultValue ''
-   */ _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;
+    var ref;
+    this.isHide = (ref = props === null || props === void 0 ? void 0 : props.isHide) !== null && ref !== void 0 ? ref : 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;
+    var ref1;
+    this.caption = (ref1 = props === null || props === void 0 ? void 0 : props.caption) !== null && ref1 !== void 0 ? ref1 : caption;
 };
-_defineProperty(Property, "Rules", PropertyRules);
-_defineProperty(Property, "RuntimeRules", PropertyRuntimeRules);
+Property.Rules = PropertyRules;
+Property.RuntimeRules = PropertyRuntimeRules;
 export default Property;
 export { Property, PropertyRules, PropertyRuntimeRules };