@byteluck-fe/model-driven-core 2.2.2-beta.8 → 2.3.1-beta.2

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

@@ -1,6 +1,6 @@
 function _arrayLikeToArray(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    for(var i1 = 0, arr2 = new Array(len); i1 < len; i1++)arr2[i1] = arr[i1];
     return arr2;
 }
 function _arrayWithHoles(arr) {
@@ -44,8 +44,8 @@ function _classCallCheck(instance, Constructor) {
     }
 }
 function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
+    for(var i1 = 0; i1 < props.length; i1++){
+        var descriptor = props[i1];
         descriptor.enumerable = descriptor.enumerable || false;
         descriptor.configurable = true;
         if ("value" in descriptor) descriptor.writable = true;
@@ -87,8 +87,8 @@ function _nonIterableSpread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
+    for(var i1 = 1; i1 < arguments.length; i1++){
+        var source = arguments[i1] != null ? arguments[i1] : {};
         var ownKeys = Object.keys(source);
         if (typeof Object.getOwnPropertySymbols === "function") {
             ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
@@ -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,101 +115,7 @@ 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 regeneratorRuntime from "regenerator-runtime";
 import Property from "./property";
 import { genNonDuplicateId, JSONCopy, referenceError, updateValueFromKeys } from "@byteluck-fe/model-driven-shared";
 import { createValidator } from "../Validator";
@@ -226,22 +132,22 @@ var Control = /*#__PURE__*/ function _target() {
         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;
+        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() {
@@ -276,41 +182,37 @@ var Control = /*#__PURE__*/ function _target() {
     };
     _proto.preValidate = function preValidate() {
         var _this = this;
-        return _asyncToGenerator(function() {
+        return _asyncToGenerator(/*#__PURE__*/ 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);
+        }))();
     };
     // 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){
+        return _asyncToGenerator(/*#__PURE__*/ 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) {
@@ -320,44 +222,36 @@ 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
+                ]
+            ]);
+        }))();
     };
     _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;
+        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,
@@ -412,8 +306,8 @@ var Control = /*#__PURE__*/ function _target() {
     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));
+            var _setting;
+            (_setting = this.setting).push.apply(_setting, _toConsumableArray(setting.add));
         }
         if (setting.remove) {
             this.removeSettingItem(setting.remove);
@@ -469,13 +363,13 @@ export { Control as DesignerControl };
         });
         // 移除对应选项
         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, ref1;
+            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
+            !((ref1 = _this.setting[settingIndex].showItems) === null || ref1 === void 0 ? void 0 : ref1.length) && // @ts-ignore
             _this.setting.splice(settingIndex, 1);
         }
     });
@@ -501,13 +395,13 @@ export { Control as DesignerControl };
             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";
+                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/property.js

@@ -148,11 +148,11 @@ var Property = function Property(props) {
     "use strict";
     var caption = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
     _classCallCheck(this, Property);
-    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;
 };
 Property.Rules = PropertyRules;
 Property.RuntimeRules = PropertyRuntimeRules;

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

@@ -33,22 +33,22 @@ var Control = /*#__PURE__*/ function _target() {
         _classCallCheck(this, Control);
         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;
+        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"));
         }
-        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 _props_type;
-        this.type = (_props_type = props === null || props === void 0 ? void 0 : props.type) !== null && _props_type !== void 0 ? _props_type : controlType;
+        var ref1;
+        this.id = (ref1 = props === null || props === void 0 ? void 0 : props.id) !== null && ref1 !== void 0 ? ref1 : genNonDuplicateId(10);
+        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);
         this.customEvents = controlCustomEvents;
-        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 _props_fieldType;
-        this.fieldType = (_props_fieldType = props === null || props === void 0 ? void 0 : props.fieldType) !== null && _props_fieldType !== void 0 ? _props_fieldType : controlFieldType;
-        var _props_pageStatus;
-        this.pageStatus = (_props_pageStatus = props === null || props === void 0 ? void 0 : props.pageStatus) !== null && _props_pageStatus !== void 0 ? _props_pageStatus : PAGE_STATUS.UNKNOWN;
+        var ref3;
+        this.controlType = (ref3 = props === null || props === void 0 ? void 0 : props.controlType) !== null && ref3 !== void 0 ? ref3 : "base";
+        var ref4;
+        this.fieldType = (ref4 = props === null || props === void 0 ? void 0 : props.fieldType) !== null && ref4 !== void 0 ? ref4 : controlFieldType;
+        var ref5;
+        this.pageStatus = (ref5 = props === null || props === void 0 ? void 0 : props.pageStatus) !== null && ref5 !== void 0 ? ref5 : PAGE_STATUS.UNKNOWN;
     }
     _createClass(Control, [
         {

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

@@ -104,21 +104,21 @@ var ColumnControlProperty = /*#__PURE__*/ function(Property) {
         _classCallCheck(this, ColumnControlProperty);
         var _this;
         _this = _super.call(this, props);
-        var _props_width;
-        _this.width = (_props_width = props === null || props === void 0 ? void 0 : props.width) !== null && _props_width !== void 0 ? _props_width : 150;
+        var ref;
+        _this.width = (ref = props === null || props === void 0 ? void 0 : props.width) !== null && ref !== void 0 ? ref : 150;
         _this.widthType = (props === null || props === void 0 ? void 0 : props.widthType) || "auto";
-        var _props_caption;
-        _this.caption = (_props_caption = props === null || props === void 0 ? void 0 : props.caption) !== null && _props_caption !== void 0 ? _props_caption : "";
-        var _props_fixed;
-        _this.fixed = (_props_fixed = props === null || props === void 0 ? void 0 : props.fixed) !== null && _props_fixed !== void 0 ? _props_fixed : "none";
+        var ref1;
+        _this.caption = (ref1 = props === null || props === void 0 ? void 0 : props.caption) !== null && ref1 !== void 0 ? ref1 : "";
+        var ref2;
+        _this.fixed = (ref2 = props === null || props === void 0 ? void 0 : props.fixed) !== null && ref2 !== void 0 ? ref2 : "none";
         _this.autoWidth = new AutoWidth(props === null || props === void 0 ? void 0 : props.autoWidth);
         _this.dataBind = new DataBind(props === null || props === void 0 ? void 0 : props.dataBind);
-        var _props_sort;
-        _this.sort = (_props_sort = props === null || props === void 0 ? void 0 : props.sort) !== null && _props_sort !== void 0 ? _props_sort : true;
+        var ref3;
+        _this.sort = (ref3 = props === null || props === void 0 ? void 0 : props.sort) !== null && ref3 !== void 0 ? ref3 : true;
         _this.align = props === null || props === void 0 ? void 0 : props.align;
         _this.colSpan = props === null || props === void 0 ? void 0 : props.colSpan;
-        var _props_adaptiveRowHeight;
-        _this.adaptiveRowHeight = (_props_adaptiveRowHeight = props === null || props === void 0 ? void 0 : props.adaptiveRowHeight) !== null && _props_adaptiveRowHeight !== void 0 ? _props_adaptiveRowHeight : false;
+        var ref4;
+        _this.autoHeight = (ref4 = props === null || props === void 0 ? void 0 : props.autoHeight) !== null && ref4 !== void 0 ? ref4 : false;
         return _this;
     }
     return ColumnControlProperty;
@@ -145,13 +145,13 @@ var ColumnOptionAndDataSourcePropertyRules = /*#__PURE__*/ function(ColumnContro
             {
                 type: "array",
                 message: RulesMessage.getMessage("isNotArray")
-            }
+            }, 
         ];
         _this.datasourceBind = [
             {
                 type: "object",
                 message: RulesMessage.getMessage("isNotObject")
-            }
+            }, 
         ];
         initOptionAndDataSourceRules.call(_assertThisInitialized(_this), props);
         return _this;

package/dist/esm/common/ControlArray.js

@@ -25,9 +25,9 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import { isArray, isPlainObject } from "@byteluck-fe/model-driven-shared";
 export function setPropertyDontEnum(obj, property) {
-    var _Object_getOwnPropertyDescriptors_property;
+    var ref;
     // 如果没有被设置过不允许枚举的话，说明是第一次被设置，需要设置属性不允许枚举
-    if ((_Object_getOwnPropertyDescriptors_property = Object.getOwnPropertyDescriptors(obj)[property]) === null || _Object_getOwnPropertyDescriptors_property === void 0 ? void 0 : _Object_getOwnPropertyDescriptors_property.enumerable) {
+    if ((ref = Object.getOwnPropertyDescriptors(obj)[property]) === null || ref === void 0 ? void 0 : ref.enumerable) {
         Object.defineProperty(obj, property, {
             enumerable: false
         });
@@ -45,8 +45,8 @@ export function defineArrayParent(controls, parent) {
 }
 var targetKey = Symbol("targetKey");
 function getTargetValue(value) {
-    var _value_targetKey;
-    return (_value_targetKey = value[targetKey]) !== null && _value_targetKey !== void 0 ? _value_targetKey : value;
+    var _targetKey;
+    return (_targetKey = value[targetKey]) !== null && _targetKey !== void 0 ? _targetKey : value;
 }
 function proxyState(target, parent) {
     defineArrayParent(target, parent);

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

@@ -88,7 +88,7 @@ var FormControl = /*#__PURE__*/ function(DesignerControl) {
 FormControl.controlEventKeys = [
     "on_change",
     "on_focus",
-    "on_blur"
+    "on_blur", 
 ];
 export default FormControl;
 export { FormControl as DesignerFormControl };

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

@@ -197,28 +197,28 @@ var BaseControlProperty = /*#__PURE__*/ function(Property) {
         _classCallCheck(this, BaseControlProperty);
         var _this;
         _this = _super.call(this, props);
-        var _props_caption;
-        _this.caption = (_props_caption = props === null || props === void 0 ? void 0 : props.caption) !== null && _props_caption !== void 0 ? _props_caption : "";
-        var _props_isHideCaption;
-        _this.isHideCaption = (_props_isHideCaption = props === null || props === void 0 ? void 0 : props.isHideCaption) !== null && _props_isHideCaption !== void 0 ? _props_isHideCaption : false;
-        var _props_isShowCaptionTip;
-        _this.isShowCaptionTip = (_props_isShowCaptionTip = props === null || props === void 0 ? void 0 : props.isShowCaptionTip) !== null && _props_isShowCaptionTip !== void 0 ? _props_isShowCaptionTip : false;
-        var _props_captionTip;
-        _this.captionTip = (_props_captionTip = props === null || props === void 0 ? void 0 : props.captionTip) !== null && _props_captionTip !== void 0 ? _props_captionTip : "";
-        var _props_defaultState;
-        _this.defaultState = (_props_defaultState = props === null || props === void 0 ? void 0 : props.defaultState) !== null && _props_defaultState !== void 0 ? _props_defaultState : "default";
-        var _props_labelPosition;
-        _this.labelPosition = (_props_labelPosition = props === null || props === void 0 ? void 0 : props.labelPosition) !== null && _props_labelPosition !== void 0 ? _props_labelPosition : "top";
-        var _props_placeholder;
-        _this.placeholder = (_props_placeholder = props === null || props === void 0 ? void 0 : props.placeholder) !== null && _props_placeholder !== void 0 ? _props_placeholder : "";
-        var _props_required;
-        _this.required = (_props_required = props === null || props === void 0 ? void 0 : props.required) !== null && _props_required !== void 0 ? _props_required : false;
-        var _props_requiredMessage;
-        _this.requiredMessage = (_props_requiredMessage = props === null || props === void 0 ? void 0 : props.requiredMessage) !== null && _props_requiredMessage !== void 0 ? _props_requiredMessage : "";
+        var ref;
+        _this.caption = (ref = props === null || props === void 0 ? void 0 : props.caption) !== null && ref !== void 0 ? ref : "";
+        var ref1;
+        _this.isHideCaption = (ref1 = props === null || props === void 0 ? void 0 : props.isHideCaption) !== null && ref1 !== void 0 ? ref1 : false;
+        var ref2;
+        _this.isShowCaptionTip = (ref2 = props === null || props === void 0 ? void 0 : props.isShowCaptionTip) !== null && ref2 !== void 0 ? ref2 : false;
+        var ref3;
+        _this.captionTip = (ref3 = props === null || props === void 0 ? void 0 : props.captionTip) !== null && ref3 !== void 0 ? ref3 : "";
+        var ref4;
+        _this.defaultState = (ref4 = props === null || props === void 0 ? void 0 : props.defaultState) !== null && ref4 !== void 0 ? ref4 : "default";
+        var ref5;
+        _this.labelPosition = (ref5 = props === null || props === void 0 ? void 0 : props.labelPosition) !== null && ref5 !== void 0 ? ref5 : "top";
+        var ref6;
+        _this.placeholder = (ref6 = props === null || props === void 0 ? void 0 : props.placeholder) !== null && ref6 !== void 0 ? ref6 : "";
+        var ref7;
+        _this.required = (ref7 = props === null || props === void 0 ? void 0 : props.required) !== null && ref7 !== void 0 ? ref7 : false;
+        var ref8;
+        _this.requiredMessage = (ref8 = props === null || props === void 0 ? void 0 : props.requiredMessage) !== null && ref8 !== void 0 ? ref8 : "";
         //form 组件优先初始化DataBind
         _this.dataBind = new DataBind(props === null || props === void 0 ? void 0 : props.dataBind);
-        var _props_defaultValue;
-        _this.defaultValue = (_props_defaultValue = props === null || props === void 0 ? void 0 : props.defaultValue) !== null && _props_defaultValue !== void 0 ? _props_defaultValue : "";
+        var ref9;
+        _this.defaultValue = (ref9 = props === null || props === void 0 ? void 0 : props.defaultValue) !== null && ref9 !== void 0 ? ref9 : "";
         return _this;
     }
     return BaseControlProperty;
@@ -245,13 +245,13 @@ var OptionAndDataSourcePropertyRules = /*#__PURE__*/ function(BaseControlPropert
             {
                 type: "array",
                 message: RulesMessage.getMessage("isNotArray")
-            }
+            }, 
         ];
         _this.datasourceBind = [
             {
                 type: "object",
                 message: RulesMessage.getMessage("isNotObject")
-            }
+            }, 
         ];
         initOptionAndDataSourceRules.call(_assertThisInitialized(_this), props);
         return _this;