@byteluck-fe/model-driven-core 2.7.0-beta.4 → 2.8.0-alpha.1a

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

@@ -475,6 +475,7 @@ var Control = /*#__PURE__*/ function _target() {
     ]);
     return Control;
 }();
+_define_property(Control, "mode", "Designer");
 _define_property(Control, "controlName", "控件");
 _define_property(Control, "controlIcon", "icon");
 _define_property(Control, "controlType", "control");
@@ -501,10 +502,12 @@ export { Control as DesignerControl };
         keys
     ];
     deleteKeys.forEach(function(deleteKey) {
+        var _this_setting;
         // 是否存在子项
         var isHasItem = typeof deleteKey !== "string";
+        // 判断setting是否是自定义控件setting项
         // @ts-ignore
-        var settingIndex = _this.setting.findIndex(function(option) {
+        var settingIndex = (_this_setting = _this.setting) === null || _this_setting === void 0 ? void 0 : _this_setting.findIndex(function(option) {
             return option.key === (isHasItem ? deleteKey.key : deleteKey);
         });
         // 移除对应选项

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

@@ -171,6 +171,7 @@ var PropertyRuntimeRules = /*#__PURE__*/ function(Array1) {
     var _props_caption;
     this.caption = (_props_caption = props === null || props === void 0 ? void 0 : props.caption) !== null && _props_caption !== void 0 ? _props_caption : caption;
 };
+_define_property(Property, "mode", void 0);
 _define_property(Property, "Rules", PropertyRules);
 _define_property(Property, "RuntimeRules", PropertyRuntimeRules);
 export default Property;

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

@@ -85,6 +85,7 @@ var Control = /*#__PURE__*/ function _target() {
     ]);
     return Control;
 }();
+_define_property(Control, "mode", "Runtime");
 _define_property(Control, "controlType", "control");
 _define_property(Control, "controlFieldType", void 0);
 _define_property(Control, "__is_control__", true);

package/dist/esm/common/ControlArray.js

@@ -33,14 +33,16 @@ export function setPropertyDontEnum(obj, property) {
         });
     }
 }
-export function defineParent(control, parent) {
-    control.parent = parent;
-    // 如果没有被设置过不允许枚举的话，说明是第一次被代理，需要设置parent属性不允许枚举
-    setPropertyDontEnum(control, "parent");
+export function defineParent(control, parent, mode) {
+    if (mode === "Designer") {
+        control.parent = parent;
+        // 如果没有被设置过不允许枚举的话，说明是第一次被代理，需要设置parent属性不允许枚举
+        setPropertyDontEnum(control, "parent");
+    }
 }
-export function defineArrayParent(controls, parent) {
+export function defineArrayParent(controls, parent, mode) {
     controls.forEach(function(item) {
-        defineParent(item, parent);
+        defineParent(item, parent, mode);
     });
 }
 var targetKey = Symbol("targetKey");
@@ -48,8 +50,8 @@ function getTargetValue(value) {
     var _value_targetKey;
     return (_value_targetKey = value[targetKey]) !== null && _value_targetKey !== void 0 ? _value_targetKey : value;
 }
-function proxyState(target, parent) {
-    defineArrayParent(target, parent);
+function proxyState(target, parent, mode) {
+    defineArrayParent(target, parent, mode);
     return new Proxy(target, {
         get: function get(t, p) {
             for(var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
@@ -79,21 +81,21 @@ function proxyState(target, parent) {
                 value
             ].concat(_to_consumable_array(args)));
             if (isPlainObject(value)) {
-                defineParent(value, parent);
+                defineParent(value, parent, mode);
             }
             return result;
         }
     });
 }
-export function defineControlArrayToProperty(obj, property, initialValue, parent) {
+export function defineControlArrayToProperty(obj, property, initialValue, parent, mode) {
     var _parent = parent !== null && parent !== void 0 ? parent : obj;
-    var value = proxyState(getTargetValue(initialValue !== null && initialValue !== void 0 ? initialValue : []), _parent);
+    var value = proxyState(getTargetValue(initialValue !== null && initialValue !== void 0 ? initialValue : []), _parent, mode);
     Object.defineProperty(obj, property, {
         get: function get() {
             return value;
         },
         set: function set(newValue) {
-            value = proxyState(getTargetValue(newValue), _parent);
+            value = proxyState(getTargetValue(newValue), _parent, mode);
         },
         enumerable: true
     });

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

@@ -41,13 +41,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _possible_constructor_return(self, call) {
     if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
@@ -93,6 +86,7 @@ import { RulesMessage, JSONCopy } from "@byteluck-fe/model-driven-shared";
 import { Property, PropertyRules, PropertyRuntimeRules } from "../BaseControl";
 import { initOptionAndDataSourceRules } from "../initOptionAndDataSourceRules";
 import { DataBind } from "../../framework";
+import { isDataBind } from "../../framework/isDataBind";
 var BaseControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
     "use strict";
     _inherits(BaseControlPropertyRules, PropertyRules);
@@ -151,7 +145,8 @@ var BaseControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
                 message: RulesMessage.getMessage("pleaseEnterFieldCode")
             }
         };
-        if (_instanceof(props.dataBind, DataBind)) {
+        // if (props.dataBind instanceof DataBind) {
+        if (isDataBind(props.dataBind)) {
             _this.dataBind = {
                 type: "object",
                 required: true,
@@ -190,13 +185,16 @@ var BaseControlPropertyRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRule
         _class_call_check(this, BaseControlPropertyRuntimeRules);
         var _this;
         _this = _super.call(this, props);
-        _this.push({
-            type: "string",
-            required: props.isHide ? false : props.required,
-            message: props.requiredMessage !== "" ? props.requiredMessage : RulesMessage.getMessage("runtimeRequired", {
-                caption: props.caption
-            })
-        });
+        var isRequired = props.isHide ? false : props.required;
+        if (isRequired) {
+            _this.push({
+                type: "string",
+                required: isRequired,
+                message: props.requiredMessage !== "" ? props.requiredMessage : RulesMessage.getMessage("runtimeRequired", {
+                    caption: props.caption
+                })
+            });
+        }
         return _this;
     }
     return BaseControlPropertyRuntimeRules;

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

@@ -335,7 +335,7 @@ var LayoutControl = /*#__PURE__*/ function _target(DesignerControl) {
         _define_property(_assert_this_initialized(_this), "props", void 0);
         var _ref = _instanceof(this, LayoutControl) ? this.constructor : void 0, excludes = _ref.excludes, childrenMaxLength = _ref.childrenMaxLength;
         _this.props = new LayoutControlProperty(props === null || props === void 0 ? void 0 : props.props);
-        defineControlArrayToProperty(_assert_this_initialized(_this), "children", props === null || props === void 0 ? void 0 : props.children);
+        defineControlArrayToProperty(_assert_this_initialized(_this), "children", props === null || props === void 0 ? void 0 : props.children, undefined, "Designer");
         _this.excludes = JSONCopy(excludes);
         _this.childrenMaxLength = childrenMaxLength;
         return _this;

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

@@ -97,7 +97,7 @@ var LayoutControl = /*#__PURE__*/ function(RuntimeControl) {
         _define_property(_assert_this_initialized(_this), "children", void 0);
         _define_property(_assert_this_initialized(_this), "props", void 0);
         _this.props = new LayoutControlProperty(props === null || props === void 0 ? void 0 : props.props);
-        defineControlArrayToProperty(_assert_this_initialized(_this), "children", props === null || props === void 0 ? void 0 : props.children);
+        defineControlArrayToProperty(_assert_this_initialized(_this), "children", props === null || props === void 0 ? void 0 : props.children, undefined, "Runtime");
         return _this;
     }
     return LayoutControl;

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

@@ -320,7 +320,7 @@ var ListControl = /*#__PURE__*/ function(DesignerControl) {
         _this = _super.call(this, props);
         _define_property(_assert_this_initialized(_this), "controlType", "list");
         _define_property(_assert_this_initialized(_this), "props", void 0);
-        _this.props = new ListControlProperty(_assert_this_initialized(_this), props === null || props === void 0 ? void 0 : props.props);
+        _this.props = new ListControlProperty(_assert_this_initialized(_this), props === null || props === void 0 ? void 0 : props.props, "Designer");
         return _this;
     }
     _create_class(ListControl, [
@@ -382,13 +382,22 @@ var ListControl = /*#__PURE__*/ function(DesignerControl) {
         {
             key: "toSchema",
             value: function toSchema() {
+                var _this_props_footers, _this_props;
                 var superSchema = _get(_get_prototype_of(ListControl.prototype), "toSchema", this).call(this);
                 var headers = this.props.headers.map(function(item) {
                     return item.toSchema();
                 });
+                var footers = (_this_props = this.props) === null || _this_props === void 0 ? void 0 : (_this_props_footers = _this_props.footers) === null || _this_props_footers === void 0 ? void 0 : _this_props_footers.map(function(item) {
+                    if (item) {
+                        return item.toSchema();
+                    } else {
+                        return undefined;
+                    }
+                });
                 return _object_spread_props(_object_spread({}, superSchema), {
                     props: _object_spread_props(_object_spread({}, this.props), {
-                        headers: headers
+                        headers: headers,
+                        footers: footers
                     })
                 });
             }

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

@@ -88,12 +88,25 @@ var ListControlProperty = /*#__PURE__*/ function(Property) {
     "use strict";
     _inherits(ListControlProperty, Property);
     var _super = _create_super(ListControlProperty);
-    function ListControlProperty(parent, props) {
+    function ListControlProperty(parent, props, mode) {
         _class_call_check(this, ListControlProperty);
         var _this;
         _this = _super.call(this, props);
         _define_property(_assert_this_initialized(_this), "headers", void 0);
-        defineControlArrayToProperty(_assert_this_initialized(_this), "headers", props === null || props === void 0 ? void 0 : props.headers, parent);
+        _define_property(_assert_this_initialized(_this), "footers", void 0);
+        _define_property(_assert_this_initialized(_this), "pageIndex", void 0);
+        _define_property(_assert_this_initialized(_this), "pageSize", void 0);
+        _define_property(_assert_this_initialized(_this), "pageSizeOptions", void 0);
+        defineControlArrayToProperty(_assert_this_initialized(_this), "headers", props === null || props === void 0 ? void 0 : props.headers, parent, mode);
+        defineControlArrayToProperty(_assert_this_initialized(_this), "footers", props === null || props === void 0 ? void 0 : props.footers, parent);
+        var _props_pageIndex;
+        _this.pageIndex = (_props_pageIndex = props === null || props === void 0 ? void 0 : props.pageIndex) !== null && _props_pageIndex !== void 0 ? _props_pageIndex : 1;
+        var _props_pageSize;
+        _this.pageSize = (_props_pageSize = props === null || props === void 0 ? void 0 : props.pageSize) !== null && _props_pageSize !== void 0 ? _props_pageSize : 20;
+        var _props_pageSizeOptions;
+        _this.pageSizeOptions = (_props_pageSizeOptions = props === null || props === void 0 ? void 0 : props.pageSizeOptions) !== null && _props_pageSizeOptions !== void 0 ? _props_pageSizeOptions : [
+            20
+        ];
         return _this;
     }
     return ListControlProperty;

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

@@ -110,8 +110,8 @@ var ListControl = /*#__PURE__*/ function(RuntimeControl) {
         _define_property(_assert_this_initialized(_this), "controlType", "list");
         _define_property(_assert_this_initialized(_this), "children", void 0);
         _define_property(_assert_this_initialized(_this), "props", void 0);
-        _this.props = new ListControlProperty(_assert_this_initialized(_this), props === null || props === void 0 ? void 0 : props.props);
-        defineControlArrayToProperty(_assert_this_initialized(_this), "children", props === null || props === void 0 ? void 0 : props.children);
+        _this.props = new ListControlProperty(_assert_this_initialized(_this), props === null || props === void 0 ? void 0 : props.props, "Runtime");
+        defineControlArrayToProperty(_assert_this_initialized(_this), "children", props === null || props === void 0 ? void 0 : props.children, undefined, "Runtime");
         return _this;
     }
     _create_class(ListControl, [

package/dist/esm/framework/RegisterControls.js

@@ -31,6 +31,7 @@ function _define_property(obj, key, value) {
     return obj;
 }
 import { error, CONTROL_BASE_TYPE, warn } from "@byteluck-fe/model-driven-shared";
+import { setPropertyDontEnum } from "../common/ControlArray";
 var baseStaticControls = [];
 export var RegisterControls = /*#__PURE__*/ function() {
     "use strict";
@@ -129,13 +130,29 @@ export var RegisterControls = /*#__PURE__*/ function() {
                         return _this.createControl(item, beforeCreateInstance);
                     });
                 }
-                // @ts-ignore
-                if (this.isListControl(schema) && schema.props.headers) {
+                if (this.isListControl(schema)) {
                     // @ts-ignore
-                    schema.props.headers = schema.props.headers.map(function(item) {
-                        return(// @ts-ignore
-                        _this.createControl(item, beforeCreateInstance));
-                    });
+                    var props = schema.props;
+                    if (props.headers) {
+                        // @ts-ignore
+                        props.headers = props.headers.map(function(item) {
+                            return(// @ts-ignore
+                            _this.createControl(item, beforeCreateInstance));
+                        });
+                    }
+                    // list类型的控件，允许存在footer
+                    if (props.footers) {
+                        // @ts-ignore
+                        props.footers = props.footers.map(function(item) {
+                            var newctl;
+                            // footers 允许有空存在
+                            if (item) {
+                                // @ts-ignore
+                                newctl = _this.createControl(item, beforeCreateInstance);
+                            }
+                            return newctl;
+                        });
+                    }
                 }
                 // @ts-ignore
                 var Constructor = this.getControlFormType(schema.type);
@@ -148,9 +165,15 @@ export var RegisterControls = /*#__PURE__*/ function() {
                             createSchema = result;
                         }
                     }
-                    // @ts-ignore
-                    var control = new Constructor(createSchema);
-                    // this.defineParentToChildren(control)
+                    var control;
+                    if (Constructor.mode === "Runtime") {
+                        control = createSchema;
+                        // this.defineParentToChildren(control)
+                        this._setParentPrototypeToSchema(control, this);
+                    } else {
+                        // @ts-ignore
+                        control = new Constructor(createSchema);
+                    }
                     return control;
                 } else {
                     error(// @ts-ignore
@@ -158,6 +181,60 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "resetInstanceParent",
+            value: function resetInstanceParent(schema, parentControl) {
+                // @ts-ignore
+                delete schema.parent;
+                Object.defineProperty(schema, "parent", {
+                    configurable: true,
+                    get: function get() {
+                        return parentControl;
+                    }
+                });
+                setPropertyDontEnum(schema, "parent");
+            }
+        },
+        {
+            key: "_setParentPrototypeToSchema",
+            value: function _setParentPrototypeToSchema(schema, runtime) {
+                // if (Reflect.has(schema, 'parent')) {
+                //   return
+                // }
+                if (runtime._type !== "Runtime") {
+                    return;
+                }
+                Object.defineProperty(schema, "parent", {
+                    configurable: true,
+                    get: function get() {
+                        // @ts-ignore
+                        var id = schema.id;
+                        var controlParentIdMap = runtime._controlParentIdMap;
+                        var instanceMap = runtime.instanceMap;
+                        if (!controlParentIdMap || !instanceMap) {
+                            return;
+                        }
+                        var parentId = controlParentIdMap[id];
+                        var selfInInstances = instanceMap[id];
+                        if (!parentId && !selfInInstances) {
+                            return;
+                        }
+                        var selfIndex = selfInInstances.findIndex(function(item) {
+                            return item == schema;
+                        });
+                        var parentInstances = instanceMap[parentId] || [];
+                        var parentInstance;
+                        if (parentInstances.length !== selfInInstances.length) {
+                            parentInstance = parentInstances[0];
+                        } else {
+                            parentInstance = parentInstances[selfIndex];
+                        }
+                        return parentInstance;
+                    }
+                });
+                setPropertyDontEnum(schema, "parent");
+            }
+        },
         {
             key: "createControlInstance",
             value: function createControlInstance(type, initSchema) {
@@ -185,14 +262,28 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 var _this = this;
                 this.constructor.staticControls.forEach(function(item) {
                     _this.register(item[type]);
+                    RegisterControls.staticControlsRuntimeRules.set(item.Runtime.controlType, item.Property.RuntimeRules);
+                    item.Property.mode = type;
                 });
             }
         }
     ], [
+        {
+            key: "staticGetRules",
+            value: function staticGetRules(controlType, props) {
+                var Rules = RegisterControls.staticControlsRuntimeRules.get(controlType);
+                var result = [];
+                if (Rules) {
+                    var rules = new Rules(props);
+                    result = Array.from(rules);
+                }
+                return result;
+            }
+        },
         {
             key: "register",
-            value: function register(control) {
-                var Designer = control.Designer, Runtime = control.Runtime;
+            value: function register(control, mode) {
+                var Designer = control.Designer, Runtime = control.Runtime, Property = control.Property;
                 if (!Designer || !Runtime || !Designer.__is_control__ || !Runtime.__is_control__) {
                     error("".concat(control, " is can't register as a Control"));
                 }
@@ -205,12 +296,14 @@ export var RegisterControls = /*#__PURE__*/ function() {
                 }
                 this.staticRegisteredTypes.add(Designer.controlType);
                 this.staticControls.push(control);
+                Property.mode = mode;
                 return this;
             }
         }
     ]);
     return RegisterControls;
 }();
+_define_property(RegisterControls, "staticControlsRuntimeRules", new Map());
 _define_property(RegisterControls, "staticControls", baseStaticControls);
 _define_property(RegisterControls, "staticRegisteredTypes", new Set(baseStaticControls.map(function(item) {
     return item.Designer.controlType;

package/dist/esm/framework/index.js

@@ -41,13 +41,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _possible_constructor_return(self, call) {
     if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
@@ -112,12 +105,18 @@ export * from "./RegisterControls";
    * @defaultValue ''
    * @public
    */ _define_property(this, "fieldType", void 0);
+    /**
+   * 表别名
+   * @defaultValue undefined
+   * @public
+   */ _define_property(this, "aliasCode", void 0);
     var _props_dataCode;
     this.dataCode = (_props_dataCode = props === null || props === void 0 ? void 0 : props.dataCode) !== null && _props_dataCode !== void 0 ? _props_dataCode : "";
     var _props_fieldCode;
     this.fieldCode = (_props_fieldCode = props === null || props === void 0 ? void 0 : props.fieldCode) !== null && _props_fieldCode !== void 0 ? _props_fieldCode : "";
     var _props_fieldType;
     this.fieldType = (_props_fieldType = props === null || props === void 0 ? void 0 : props.fieldType) !== null && _props_fieldType !== void 0 ? _props_fieldType : "";
+    this.aliasCode = props === null || props === void 0 ? void 0 : props.aliasCode;
 };
 export var AutoWidth = function AutoWidth(props) {
     "use strict";
@@ -410,6 +409,18 @@ export var RightVariable = function RightVariable(props) {
     this.leftVariableBo = new LeftVariable(props === null || props === void 0 ? void 0 : props.leftVariableBo);
     this.rightVariableBo = new RightVariable(props === null || props === void 0 ? void 0 : props.rightVariableBo);
 };
+export var JoinRelation = function JoinRelation(props) {
+    "use strict";
+    _class_call_check(this, JoinRelation);
+    _define_property(this, "aliasCode", void 0);
+    _define_property(this, "datasourceBind", void 0);
+    _define_property(this, "relationFields", void 0);
+    var _props_aliasCode;
+    this.aliasCode = (_props_aliasCode = props === null || props === void 0 ? void 0 : props.aliasCode) !== null && _props_aliasCode !== void 0 ? _props_aliasCode : "";
+    this.datasourceBind = new DataSourceBind(props === null || props === void 0 ? void 0 : props.datasourceBind);
+    var _props_relationFields;
+    this.relationFields = (_props_relationFields = props === null || props === void 0 ? void 0 : props.relationFields) !== null && _props_relationFields !== void 0 ? _props_relationFields : [];
+};
 /**
  * 数据填充项
  * @public
@@ -533,7 +544,7 @@ export var DataSourceParamItem = function DataSourceParamItem(props) {
 /**
  * 给filters和orders赋值
  * */ function callFiltersAndOrders(props) {
-    var _props_filters, _props_viewFilters;
+    var _props_filters, _props_viewFilters, _props_orders;
     var _props_filters_map;
     this.filters = (_props_filters_map = props === null || props === void 0 ? void 0 : (_props_filters = props.filters) === null || _props_filters === void 0 ? void 0 : _props_filters.map(function(item) {
         if (item.children !== undefined) {
@@ -548,13 +559,11 @@ export var DataSourceParamItem = function DataSourceParamItem(props) {
         }
         return new FieldFilterCondition(item);
     })) !== null && _props_viewFilters_map !== void 0 ? _props_viewFilters_map : [];
-    if (_instanceof(this, DataSourceBind) || _instanceof(this, FillPayloadBind)) {
-        var _props_orders;
-        var _props_orders_map;
-        this.orders = (_props_orders_map = props === null || props === void 0 ? void 0 : (_props_orders = props.orders) === null || _props_orders === void 0 ? void 0 : _props_orders.map(function(item) {
-            return new DataSourceOrderItem(item);
-        })) !== null && _props_orders_map !== void 0 ? _props_orders_map : [];
-    }
+    var _props_orders_map;
+    this.orders = (_props_orders_map = props === null || props === void 0 ? void 0 : (_props_orders = props.orders) === null || _props_orders === void 0 ? void 0 : _props_orders.map(function(item) {
+        return new DataSourceOrderItem(item);
+    })) !== null && _props_orders_map !== void 0 ? _props_orders_map : [];
+// }
 }
 /**
  * 数据源绑定配置
@@ -669,6 +678,7 @@ export var LinkOperationOption = function LinkOperationOption(props) {
     _define_property(this, "confirmMessage", void 0);
     _define_property(this, "defaultState", void 0);
     _define_property(this, "formKey", void 0);
+    _define_property(this, "formType", void 0);
     _define_property(this, "icon", void 0);
     _define_property(this, "needConfirm", void 0);
     _define_property(this, "openType", void 0);
@@ -685,6 +695,7 @@ export var LinkOperationOption = function LinkOperationOption(props) {
     this.defaultState = (_props_defaultState = props === null || props === void 0 ? void 0 : props.defaultState) !== null && _props_defaultState !== void 0 ? _props_defaultState : "default";
     var _props_formKey;
     this.formKey = (_props_formKey = props === null || props === void 0 ? void 0 : props.formKey) !== null && _props_formKey !== void 0 ? _props_formKey : undefined;
+    this.formType = props === null || props === void 0 ? void 0 : props.formType;
     var _props_icon;
     this.icon = (_props_icon = props === null || props === void 0 ? void 0 : props.icon) !== null && _props_icon !== void 0 ? _props_icon : "iconliulan1";
     var _props_needConfirm;
@@ -988,7 +999,7 @@ export function initImageOptions(options) {
     var _props_amount;
     this.amount = (_props_amount = props === null || props === void 0 ? void 0 : props.amount) !== null && _props_amount !== void 0 ? _props_amount : "";
     var _props_currency;
-    this.currency = (_props_currency = props === null || props === void 0 ? void 0 : props.currency) !== null && _props_currency !== void 0 ? _props_currency : AMOUNT_TYPE.CNY;
+    this.currency = (_props_currency = props === null || props === void 0 ? void 0 : props.currency) !== null && _props_currency !== void 0 ? _props_currency : "CNY";
 };
 /**
  * 日期区间数据绑定项
@@ -1174,7 +1185,6 @@ export var COMMON_SETTING_TYPE;
     COMMON_SETTING_TYPE["VIEW_FORM_MODEL_TYPE"] = "viewFormModelType";
     COMMON_SETTING_TYPE["SERVER_PAGINATION"] = "serverPagination";
     COMMON_SETTING_TYPE["IS_SHOW_CAPTION_TIP"] = "isShowCaptionTip";
-    COMMON_SETTING_TYPE["IS_SHOW_WATERMARK"] = "isShowWatermark";
     COMMON_SETTING_TYPE["ENCRYPTED"] = "encrypted";
     COMMON_SETTING_TYPE["IS_INLINE_EDIT"] = "isInlineEdit";
     COMMON_SETTING_TYPE["REVISIONS_MODE"] = "revisionsMode";
@@ -1284,3 +1294,21 @@ export var BaseStyle = function BaseStyle(props) {
     var _props_heightConfig;
     this.heightConfig = (_props_heightConfig = props === null || props === void 0 ? void 0 : props.heightConfig) !== null && _props_heightConfig !== void 0 ? _props_heightConfig : "fill";
 };
+export var OptObject = function OptObject(props) {
+    "use strict";
+    _class_call_check(this, OptObject);
+    /**
+   * 操作项编码
+   * @defaultValue ''
+   * @public
+   */ _define_property(this, "optCode", void 0);
+    /**
+   * 操作项类型
+   * @defaultValue ''
+   * @public
+   */ _define_property(this, "optType", void 0);
+    var _props_optCode;
+    this.optCode = (_props_optCode = props === null || props === void 0 ? void 0 : props.optCode) !== null && _props_optCode !== void 0 ? _props_optCode : "";
+    var _props_optType;
+    this.optType = (_props_optType = props === null || props === void 0 ? void 0 : props.optType) !== null && _props_optType !== void 0 ? _props_optType : "";
+};

package/dist/esm/framework/isDataBind.js

@@ -0,0 +1,7 @@
+export function isDataBind(dataBind) {
+    if ((dataBind === null || dataBind === void 0 ? void 0 : dataBind.dataCode) !== undefined && (dataBind === null || dataBind === void 0 ? void 0 : dataBind.fieldCode) !== undefined) {
+        return true;
+    } else {
+        return false;
+    }
+}

package/dist/esm/index.js

@@ -1,3 +1,4 @@
 export * from "./common";
 export * from "./framework";
 export * from "./type";
+export * from "./framework/isDataBind";