@byteluck-fe/model-driven-controls 1.7.0 → 1.8.0-beta.0

package/dist/esm/baseControls/BatchPrintListButton/designer.js

@@ -146,7 +146,7 @@ BatchPrintListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default BatchPrintListButtonControl;
 export { BatchPrintListButtonControl as DesignerBatchPrintListButtonControl };

package/dist/esm/baseControls/BatchPrintRecordListButton/designer.js

@@ -141,7 +141,7 @@ BatchPrintRecordListButton.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default BatchPrintRecordListButton;
 export { BatchPrintRecordListButton as DesignerBatchPrintRecordListButton };

package/dist/esm/baseControls/BatchSubmissionListButton/designer.js

@@ -150,7 +150,7 @@ BatchSubmissionListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default BatchSubmissionListButtonControl;
 export { BatchSubmissionListButtonControl as DesignerBatchSubmissionListButtonControl };

package/dist/esm/baseControls/BatchSubmissionListButton/property.js

@@ -90,7 +90,7 @@ var BatchSubmissionListButtonPropertyRules = /*#__PURE__*/ function(PropertyRule
                 type: "string",
                 required: true,
                 message: RulesMessage.getMessage("pleaseEnterProcess")
-            }, 
+            }
         ];
         return _this;
     }

package/dist/esm/baseControls/Button/designer.js

@@ -152,7 +152,7 @@ ButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default ButtonControl;
 export { ButtonControl as DesignerButtonControl };

package/dist/esm/baseControls/CreateFormListButton/designer.js

@@ -150,7 +150,7 @@ CreateFormListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default CreateFormListButtonControl;
 export { CreateFormListButtonControl as DesignerCreateFormListButtonControl };

package/dist/esm/baseControls/Dashboard/designer.js

@@ -127,7 +127,7 @@ DashboardControl.setting = [
         key: "caption",
         showItems: [
             COMMON_SETTING_TYPE.CAPTION,
-            COMMON_SETTING_TYPE.IS_HIDE_CAPTION, 
+            COMMON_SETTING_TYPE.IS_HIDE_CAPTION
         ],
         visible: true
     },
@@ -137,13 +137,13 @@ DashboardControl.setting = [
         visible: true,
         showItems: [
             COMMON_SETTING_TYPE.IS_HIDE,
-            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP, 
+            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP
         ]
     },
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default DashboardControl;
 export { DashboardControl as DesignerDashboardControl };

package/dist/esm/baseControls/Divider/designer.js

@@ -133,7 +133,7 @@ DividerControl.setting = [
         showItems: [
             COMMON_SETTING_TYPE.IS_HIDE
         ]
-    }, 
+    }
 ];
 export default DividerControl;
 export { DividerControl as DesignerDividerControl };

package/dist/esm/baseControls/ExportListButton/designer.js

@@ -146,7 +146,7 @@ ExportListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default ExportListButtonControl;
 export { ExportListButtonControl as DesignerExportListButtonControl };

package/dist/esm/baseControls/ExportListButton/property.js

@@ -99,7 +99,7 @@ var ExportListButtonProperty = /*#__PURE__*/ function(ButtonProperty) {
                     ""
                 ],
                 active: true
-            }), 
+            })
         ];
         return _this;
     }

package/dist/esm/baseControls/ExportRecordListButton/designer.js

@@ -141,7 +141,7 @@ ExportRecordListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default ExportRecordListButtonControl;
 export { ExportRecordListButtonControl as DesignerExportRecordListButtonControl };

package/dist/esm/baseControls/FormSelectButton/designer.js

@@ -154,7 +154,7 @@ FormSelectButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default FormSelectButtonControl;
 export { FormSelectButtonControl as DesignerFormSelectButtonControl };

package/dist/esm/baseControls/ImportRecordListButton/designer.js

@@ -146,7 +146,7 @@ ImportRecordListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default ImportRecordListButtonControl;
 export { ImportRecordListButtonControl as DesignerImportRecordListButtonControl };

package/dist/esm/baseControls/InvoiceCheckButton/designer.js

@@ -128,7 +128,7 @@ InvoiceCheckButtonControl.setting = [
         key: "caption",
         showItems: [
             COMMON_SETTING_TYPE.CAPTION,
-            COMMON_SETTING_TYPE.IS_HIDE_CAPTION, 
+            COMMON_SETTING_TYPE.IS_HIDE_CAPTION
         ],
         visible: true
     },
@@ -161,13 +161,13 @@ InvoiceCheckButtonControl.setting = [
         visible: true,
         showItems: [
             COMMON_SETTING_TYPE.IS_HIDE,
-            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP, 
+            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP
         ]
     },
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default InvoiceCheckButtonControl;
 export { InvoiceCheckButtonControl as DesignerInvoiceCheckButtonControl };

package/dist/esm/baseControls/Link/designer.js

@@ -144,7 +144,7 @@ LinkControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default LinkControl;
 export { LinkControl as DesignerLinkControl };

package/dist/esm/baseControls/ListSelectButton/designer.js

@@ -154,7 +154,7 @@ ListSelectButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default ListSelectButtonControl;
 export { ListSelectButtonControl as DesignerListSelectButtonControl };

package/dist/esm/baseControls/ListViewSelect/designer.js

@@ -130,7 +130,7 @@ ListViewSelectControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default ListViewSelectControl;
 export { ListViewSelectControl as DesignerListViewSelectControl };

package/dist/esm/baseControls/SubmissionRecordListButton/designer.js

@@ -141,7 +141,7 @@ SubmissionRecordListButtonControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default SubmissionRecordListButtonControl;
 export { SubmissionRecordListButtonControl as DesignerSubmissionRecordListButtonControl };

package/dist/esm/baseControls/Text/designer.js

@@ -149,7 +149,7 @@ TextControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default TextControl;
 export { TextControl as DesignerTextControl };

package/dist/esm/baseControls/TextOcrButton/designer.js

@@ -128,7 +128,7 @@ TextOcrButtonControl.setting = [
         key: "caption",
         showItems: [
             COMMON_SETTING_TYPE.CAPTION,
-            COMMON_SETTING_TYPE.IS_HIDE_CAPTION, 
+            COMMON_SETTING_TYPE.IS_HIDE_CAPTION
         ],
         visible: true
     },
@@ -161,13 +161,13 @@ TextOcrButtonControl.setting = [
         visible: true,
         showItems: [
             COMMON_SETTING_TYPE.IS_HIDE,
-            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP, 
+            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP
         ]
     },
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default TextOcrButtonControl;
 export { TextOcrButtonControl as DesignerTextOcrButtonControl };

package/dist/esm/baseControls/Title/designer.js

@@ -135,7 +135,7 @@ TitleControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default TitleControl;
 export { TitleControl as DesignerTitleControl };

package/dist/esm/baseControls/Title/property.js

@@ -127,7 +127,7 @@ var TitleProperty = /*#__PURE__*/ function(Property) {
             TitleConfigEnum.ShowSubmitUser,
             TitleConfigEnum.ShowSubmitDept,
             TitleConfigEnum.ShowSubmitTime,
-            TitleConfigEnum.ShowCurrentApprovar, 
+            TitleConfigEnum.ShowCurrentApprovar
         ];
         var ref1, ref2;
         _this.caption = (ref2 = (ref1 = props === null || props === void 0 ? void 0 : props.caption) !== null && ref1 !== void 0 ? ref1 : DesignerTitleControl === null || DesignerTitleControl === void 0 ? void 0 : DesignerTitleControl.controlName) !== null && ref2 !== void 0 ? ref2 : "";

package/dist/esm/columnControls/ArrayColumn/designer.js

@@ -116,7 +116,7 @@ ArrayColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default ArrayColumnControl;
 export { ArrayColumnControl as DesignerArrayColumnControl };

package/dist/esm/columnControls/AutoNumberColumn/designer.js

@@ -112,7 +112,7 @@ AutoNumberColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default AutoNumberColumnControl;
 export { AutoNumberColumnControl as DesignerAutoNumberColumnControl };

package/dist/esm/columnControls/CustomColumn/designer.js

@@ -224,7 +224,7 @@ CustomColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default CustomColumnControl;
 export { CustomColumnControl as DesignerCustomColumnControl };

package/dist/esm/columnControls/DecimalColumn/designer.js

@@ -151,7 +151,7 @@ DecimalColumnControl.setting = [
         showItems: [
             COMMON_SETTING_TYPE.MICROMETER,
             COMMON_SETTING_TYPE.PRECISION,
-            COMMON_SETTING_TYPE.PERCENTAGE, 
+            COMMON_SETTING_TYPE.PERCENTAGE
         ],
         visible: true
     },
@@ -162,7 +162,7 @@ DecimalColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default DecimalColumnControl;
 export { DecimalColumnControl as DesignerDecimalColumnControl };

package/dist/esm/columnControls/DepartmentColumn/designer.js

@@ -148,7 +148,7 @@ DepartmentColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default DepartmentColumnControl;
 export { DepartmentColumnControl as DesignerDepartmentColumnControl };

package/dist/esm/columnControls/EmployeeColumn/designer.js

@@ -106,7 +106,7 @@ var EmployeeColumnControl = /*#__PURE__*/ function(DesignerColumnControl) {
                         key: "displayBoList",
                         name: "显示值",
                         required: true
-                    }, 
+                    }
                 ];
             }
         }
@@ -141,7 +141,7 @@ EmployeeColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default EmployeeColumnControl;
 export { EmployeeColumnControl as DesignerEmployeeColumnControl };

package/dist/esm/columnControls/FileColumn/designer.js

@@ -112,7 +112,7 @@ FileColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default FileColumnControl;
 export { FileColumnControl as DesignerFileColumnControl };

package/dist/esm/columnControls/ImageColumn/designer.js

@@ -112,7 +112,7 @@ ImageColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default ImageColumnControl;
 export { ImageColumnControl as DesignerImageColumnControl };

package/dist/esm/columnControls/LocationColumn/designer.js

@@ -112,7 +112,7 @@ LocationColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default LocationColumnControl;
 export { LocationColumnControl as DesignerLocationColumnControl };

package/dist/esm/columnControls/OperationColumn/designer.js

@@ -109,9 +109,12 @@ var OperationColumnControl = /*#__PURE__*/ function(DesignerColumnControl) {
     // 列表操作列，后端需要check和edit，delete来处理权限等
     _proto.toDataBindModel = function toDataBindModel() {
         var dataBindModel = _get(_getPrototypeOf(OperationColumnControl.prototype), "toDataBindModel", this).call(this);
-        dataBindModel.props.check = this.props.check;
-        dataBindModel.props.edit = this.props.edit;
-        dataBindModel.props.delete = this.props.delete;
+        this.props.buttons.map(function(item) {
+            dataBindModel.props[item.type] = item;
+        });
+        // dataBindModel.props.check = this.props.check
+        // dataBindModel.props.edit = this.props.edit
+        // dataBindModel.props.delete = this.props.delete
         return dataBindModel;
     };
     return OperationColumnControl;
@@ -132,7 +135,7 @@ OperationColumnControl.setting = [
         showItems: [
             COMMON_SETTING_TYPE.CAN_CHECK,
             COMMON_SETTING_TYPE.CAN_EDIT,
-            COMMON_SETTING_TYPE.CAN_DELETE, 
+            COMMON_SETTING_TYPE.CAN_DELETE
         ],
         visible: true
     },
@@ -143,7 +146,7 @@ OperationColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default OperationColumnControl;
 export { OperationColumnControl as DesignerOperationColumnControl };

package/dist/esm/columnControls/OperationColumn/property.js

@@ -69,51 +69,43 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import { ColumnControlProperty, ColumnControlPropertyRules, OperationItem } from "@byteluck-fe/model-driven-core";
+import { ColumnControlProperty, OperationItem } from "@byteluck-fe/model-driven-core";
 import { DesignerOperationColumnControl } from "./designer";
-import { RulesMessage } from "@byteluck-fe/model-driven-shared";
-var OperationColumnControlPropertyRules = /*#__PURE__*/ function(ColumnControlPropertyRules) {
-    "use strict";
-    _inherits(OperationColumnControlPropertyRules, ColumnControlPropertyRules);
-    var _super = _createSuper(OperationColumnControlPropertyRules);
-    function OperationColumnControlPropertyRules(props) {
-        _classCallCheck(this, OperationColumnControlPropertyRules);
-        var _this;
-        _this = _super.call(this, props);
-        _this.check = [
-            {
-                type: "object",
-                message: RulesMessage.getMessage("isNotObject")
-            }, 
-        ];
-        _this.edit = [
-            {
-                type: "object",
-                message: RulesMessage.getMessage("isNotObject")
-            }, 
-        ];
-        var getRules = function() {
-            return {
-                type: "object",
-                fields: {
-                    formKey: {
-                        type: "string",
-                        required: true,
-                        message: RulesMessage.getMessage("pleaseEnterForm")
-                    }
-                }
-            };
-        };
-        if (props.check.isShow) {
-            _this.check.push(getRules());
-        }
-        if (props.edit.isShow) {
-            _this.edit.push(getRules());
-        }
-        return _this;
-    }
-    return OperationColumnControlPropertyRules;
-}(ColumnControlPropertyRules);
+//qiyu 因为都是自定义的了，无法在模型中定义必填校验了
+// class OperationColumnControlPropertyRules extends ColumnControlPropertyRules {
+//   public check: RuleItem[] = [
+//     {
+//       type: 'object',
+//       message: RulesMessage.getMessage('isNotObject'),
+//     },
+//   ]
+//   public edit: RuleItem[] = [
+//     {
+//       type: 'object',
+//       message: RulesMessage.getMessage('isNotObject'),
+//     },
+//   ]
+//   constructor(props: OperationColumnControlProperty) {
+//     super(props)
+//     const getRules = () =>
+//       ({
+//         type: 'object',
+//         fields: {
+//           formKey: {
+//             type: 'string',
+//             required: true,
+//             message: RulesMessage.getMessage('pleaseEnterForm'),
+//           },
+//         },
+//       } as RuleItem)
+//     if (props.check.isShow) {
+//       this.check.push(getRules())
+//     }
+//     if (props.edit.isShow) {
+//       this.edit.push(getRules())
+//     }
+//   }
+// }
 var OperationColumnControlProperty = /*#__PURE__*/ function(ColumnControlProperty) {
     "use strict";
     _inherits(OperationColumnControlProperty, ColumnControlProperty);
@@ -125,34 +117,30 @@ var OperationColumnControlProperty = /*#__PURE__*/ function(ColumnControlPropert
         var ref;
         _this.fixed = (ref = props === null || props === void 0 ? void 0 : props.fixed) !== null && ref !== void 0 ? ref : "right";
         var ref1;
-        _this.check = new OperationItem((ref1 = props === null || props === void 0 ? void 0 : props.check) !== null && ref1 !== void 0 ? ref1 : {
-            content: "查看",
-            type: "check",
-            isShow: false,
-            priorityProcess: true
-        });
-        var ref2;
-        _this.edit = new OperationItem((ref2 = props === null || props === void 0 ? void 0 : props.edit) !== null && ref2 !== void 0 ? ref2 : {
-            content: "编辑",
-            type: "edit",
-            isShow: false
-        });
-        var ref3;
-        _this.delete = new OperationItem((ref3 = props === null || props === void 0 ? void 0 : props.delete) !== null && ref3 !== void 0 ? ref3 : {
-            content: "删除",
-            type: "delete",
-            isShow: false
-        });
-        var ref4;
-        _this.custom = ((ref4 = props === null || props === void 0 ? void 0 : props.custom) !== null && ref4 !== void 0 ? ref4 : []).map(function(item) {
+        // this.check = new OperationItem(
+        //   props?.check ?? {
+        //     content: '查看',
+        //     type: 'check',
+        //     isShow: false,
+        //     priorityProcess: true,
+        //   }
+        // )
+        // this.edit = new OperationItem(
+        //   props?.edit ?? { content: '编辑', type: 'edit', isShow: false }
+        // )
+        // this.delete = new OperationItem(
+        //   props?.delete ?? { content: '删除', type: 'delete', isShow: false }
+        // )
+        // this.custom = (props?.custom ?? []).map((item) => new OperationItem(item))
+        _this.buttons = ((ref1 = props === null || props === void 0 ? void 0 : props.buttons) !== null && ref1 !== void 0 ? ref1 : []).map(function(item) {
             return new OperationItem(item);
         });
-        var ref5;
-        _this.caption = (ref5 = props === null || props === void 0 ? void 0 : props.caption) !== null && ref5 !== void 0 ? ref5 : DesignerOperationColumnControl.controlName;
+        var ref2;
+        _this.caption = (ref2 = props === null || props === void 0 ? void 0 : props.caption) !== null && ref2 !== void 0 ? ref2 : DesignerOperationColumnControl.controlName;
         return _this;
     }
     return OperationColumnControlProperty;
 }(ColumnControlProperty);
-OperationColumnControlProperty.Rules = OperationColumnControlPropertyRules;
 export default OperationColumnControlProperty;
-export { OperationColumnControlProperty, OperationColumnControlPropertyRules };
+// export { OperationColumnControlProperty, OperationColumnControlPropertyRules }
+export { OperationColumnControlProperty };

package/dist/esm/columnControls/PeopleColumn/designer.js

@@ -112,7 +112,7 @@ PeopleColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default PeopleColumnControl;
 export { PeopleColumnControl as DesignerPeopleColumnControl };

package/dist/esm/columnControls/TextColumn/designer.js

@@ -152,7 +152,7 @@ TextColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default TextColumnControl;
 export { TextColumnControl as DesignerTextColumnControl };

package/dist/esm/columnControls/TimescopeColumn/designer.js

@@ -148,7 +148,7 @@ TimescopeColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default TimescopeColumnControl;
 export { TimescopeColumnControl as DesignerTimescopeColumnControl };

package/dist/esm/columnControls/TimestampColumn/designer.js

@@ -148,7 +148,7 @@ TimestampColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default TimestampColumnControl;
 export { TimestampColumnControl as DesignerTimestampColumnControl };

package/dist/esm/columnControls/VarcharColumn/designer.js

@@ -120,7 +120,7 @@ VarcharColumnControl.setting = [
     {
         key: "column-sort",
         visible: true
-    }, 
+    }
 ];
 export default VarcharColumnControl;
 export { VarcharColumnControl as DesignerVarcharColumnControl };

package/dist/esm/formControls/Address/designer.js

@@ -129,7 +129,7 @@ AddressControl.setting = [
         key: "caption",
         showItems: [
             COMMON_SETTING_TYPE.CAPTION,
-            COMMON_SETTING_TYPE.IS_HIDE_CAPTION, 
+            COMMON_SETTING_TYPE.IS_HIDE_CAPTION
         ],
         visible: true
     },
@@ -151,7 +151,7 @@ AddressControl.setting = [
         showItems: [
             COMMON_SETTING_TYPE.REQUIRED,
             COMMON_SETTING_TYPE.IS_HIDE,
-            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP, 
+            COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP
         ]
     },
     {
@@ -161,7 +161,7 @@ AddressControl.setting = [
     {
         key: "super-setting",
         visible: true
-    }, 
+    }
 ];
 export default AddressControl;
 export { AddressControl as DesignerAddressControl };