zmdms-webui 0.0.97 → 0.0.99

package/dist/es/dynamicsetting/useDynamic.js

@@ -14,6 +14,7 @@ function recursionDynamicItems(list, currentDynamicList) {
         if (currentData) {
             currentData.label = result.label;
             currentData.isFind = true; // 代表当前这个字段被找到
+            currentData.disabled = result.disabled;
             // 判断是否是多级表头，这里的逻辑处理是为了兼容
             // 后面改造成多级表头的情况
             if (item.children) {

package/dist/es/form/form.js

@@ -21,7 +21,7 @@ var FORM_DYNAMIC_KEY = "ztxk-webui-dynamic-form";
 // 给子元素设置好了表单配置信息后 接下来的内容 交给动态列配置接管
 var Form = function (props, ref) {
     var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, isResetAndClear = props.isResetAndClear, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, directionColumn = props.directionColumn, isToggle = props.isToggle, toggleNum = props.toggleNum, defaultToggle = props.defaultToggle, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "formPreferences", "items", "outsideState", "onValuesChange", "isResetAndClear", "onResetHandle", "onSearchHandle", "type", "directionColumn", "isToggle", "toggleNum", "defaultToggle"]);
-    // 获取新的items
+    // 获取新的items 如果传入了配置项的话，配置项优先
     var configInfoItems = useFormPreferencesCreateNewItems(formPreferences, items).configInfoItems;
     // 根据items 和 dynamicKey 获取到动态列配置信息
     var _b = useDynamicListByItems(configInfoItems, dynamicKey, formPreferences), dynamicList = _b.dynamicList, onCurrentListChange = _b.onCurrentListChange, newItems = _b.newItems, dynamicSettingRef = _b.dynamicSettingRef;
@@ -69,7 +69,7 @@ var Form = function (props, ref) {
                     // 这里用undefined当清空值得话，会有点问题。
                     // https://github.com/react-component/select/commit/305b3dcfe627482686055a1ec9c34705623d807f
                     // 对于下拉框来说 会报这个警告 `label` of `value` is not same as `label` in Select options.
-                    // 暂时不知道如何消除这个警告 yong null 和 "" 都可以
+                    // 暂时不知道如何消除这个警告 用 null 和 "" 都可以
                     // TODO: 暂时改成null
                     (_a = form === null || form === void 0 ? void 0 : form.setFieldValue) === null || _a === void 0 ? void 0 : _a.call(form, nameKey, null);
                     // form?.setFieldsValue?.({

package/dist/es/form/hooks.js

@@ -27,9 +27,12 @@ function useDynamicListByItems(items, dynamicKey, formPreferences) {
         var result = [];
         if (dynamicKey && items) {
             result = items.map(function (item, index) {
-                var name = item.name, key = item.key, label = item.label, dynamicDisabled = item.dynamicDisabled, isDisplay = item.isDisplay;
+                var name = item.name, configName = item.configName, key = item.key, label = item.label, dynamicDisabled = item.dynamicDisabled, isDisplay = item.isDisplay;
                 return {
-                    key: name || key || "".concat(Date.now(), "-").concat(index),
+                    key: configName ||
+                        name ||
+                        key ||
+                        "".concat(Date.now(), "-").concat(index),
                     label: label,
                     disabled: dynamicDisabled === true ? true : false,
                     // 如果用户传入了 isDisplay
@@ -64,6 +67,11 @@ function useDynamicListByItems(items, dynamicKey, formPreferences) {
                 var key = item.key, checked = item.checked;
                 var childrenItem = items === null || items === void 0 ? void 0 : items.find(function (item) { return (item === null || item === void 0 ? void 0 : item.name) === key || (item === null || item === void 0 ? void 0 : item.key) === key; });
                 if (childrenItem) {
+                    // 如果已经禁用选中 不选中了 那么isDisplay不受动态列影响
+                    if (childrenItem.dynamicDisabled) {
+                        result.push(childrenItem);
+                        return;
+                    }
                     if (!checked) {
                         childrenItem.isDisplay = false;
                     }

package/dist/es/formitem/formItem.d.ts

@@ -10,11 +10,11 @@ interface IFormItem extends FormItemProps {
     /**
      * 是否必填
      */
-    isRequired?: boolean | string;
+    isRequired?: boolean | string | ((formInstance: FormInstance<any>) => boolean);
     /**
      * 是否可修改
      */
-    isChangeable?: boolean | string;
+    isChangeable?: boolean | string | ((formInstance: FormInstance<any>) => boolean);
     /**
      * 强调
      */

package/dist/es/formitem/formItem.js

@@ -10,22 +10,11 @@ import { Col, Tooltip } from 'antd';
 
 var hiddenLabelCol = { span: 0 };
 var FormItem = function (props) {
-    var _a;
     var children = props.children, isDisplay = props.isDisplay, isRequired = props.isRequired, isChangeable = props.isChangeable, isStress = props.isStress, preNode = props.preNode, nextNode = props.nextNode; props.dynamicDisabled; var hiddenBorder = props.hiddenBorder, singleSelectShowBorder = props.singleSelectShowBorder, singleSelect = props.singleSelect, hiddenLabel = props.hiddenLabel, width = props.width, className = props.className, itemClassName = props.itemClassName, render = props.render, shouldUpdateNames = props.shouldUpdateNames; props.shouldUpdateClear; var dependencies = props.dependencies, shouldUpdate = props.shouldUpdate; props.index; props.outsideState; props.shouldUpdateBeOutsideState; props.nonForm; var isCustomItem = props.isCustomItem, customStyle = props.customStyle, tipString = props.tipString, resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "singleSelect", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm", "isCustomItem", "customStyle", "tipString"]);
     var form = MemoForm.useFormInstance();
-    // 根据配置属性，判断是否渲染表单项
-    // 是否显示表单项
-    if (isDisplay === false || isDisplay === "0") {
-        return null;
-    }
-    if (typeof isDisplay === "function") {
-        var isD = isDisplay(form);
-        if (!isD) {
-            return null;
-        }
-    }
-    // 是否必填
-    if (isRequired !== undefined) {
+    // 更新是否必填配置
+    var updateIsRequired = function (isRequired) {
+        var _a;
         var isRequireBoolean = !!isRequired;
         var rules = Array.isArray(resetProps.rules) ? resetProps.rules : [];
         // 是否之前就传入了必填非必填逻辑
@@ -50,12 +39,21 @@ var FormItem = function (props) {
             });
         }
         resetProps.rules = rules;
+    };
+    // 根据配置属性，判断是否渲染表单项
+    // 是否显示表单项
+    if (isDisplay === false || isDisplay === "0") {
+        return null;
+    }
+    // 是否必填
+    if (isRequired !== undefined && typeof isRequired !== "function") {
+        updateIsRequired(isRequired);
     }
     // 是否禁用
     var itemProps = {
         disabled: false,
     };
-    if (isChangeable !== undefined) {
+    if (isChangeable !== undefined && typeof isChangeable !== "function") {
         itemProps.disabled = isChangeable === "0" ? true : !isChangeable;
     }
     var itemClasses = classNames("ztxk-form__item", itemClassName, {
@@ -94,9 +92,30 @@ var FormItem = function (props) {
                 return false;
             }
             : shouldUpdate;
-        return (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({ shouldUpdate: shouldUpdateHandle, noStyle: true }, { children: function (formInstance) {
-                        return resetProps.name ? (jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) }))) : (render && render(itemProps, formInstance));
-                    } })), nextNode ? nextNode : null] })));
+        return (jsx(MemoForm.Item, __assign({ shouldUpdate: shouldUpdateHandle, noStyle: true }, { children: function (formInstance) {
+                if (typeof isDisplay === "function") {
+                    var isD = isDisplay(form);
+                    if (!isD) {
+                        return null;
+                    }
+                }
+                if (typeof isRequired === "function") {
+                    var isR = isRequired(form);
+                    updateIsRequired(isR);
+                }
+                if (typeof isChangeable === "function") {
+                    var isC = isChangeable(form);
+                    itemProps.disabled = !isC;
+                    // 禁止修改的话
+                    if (itemProps.disabled) {
+                        itemClasses = itemClasses + " ztxk-form__item--disabled";
+                    }
+                    else {
+                        itemClasses = itemClasses.replace(" ztxk-form__item--disabled", "");
+                    }
+                }
+                return resetProps.name ? (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) })), nextNode ? nextNode : null] }))) : (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, render && render(itemProps, formInstance), nextNode ? nextNode : null] })));
+            } })));
     }
     return (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render ? render(itemProps, form) : children })), nextNode ? nextNode : null] })));
 };

package/dist/es/modal/modal.js

@@ -142,12 +142,28 @@ var Modal = function (_a, ref) {
     return (jsx(Modal$1, __assign({ open: open, onCancel: close, className: classes, okText: "\u4FDD\u5B58", onOk: footer ? undefined : onOkHandle, width: "70%", title: title, keyboard: false, maskClosable: false, confirmLoading: loading, cancelButtonProps: { loading: loading }, footer: footer }, resetProps)));
 };
 var ModalComponent = forwardRef(Modal);
+var ModalConfirm = function (modalProps) {
+    var onOk = modalProps.onOk, resetModalProps = __rest(modalProps, ["onOk"]);
+    var modalConfirm = Modal$1.confirm(__assign(__assign({}, resetModalProps), { onOk: onOk
+            ? function () {
+                setCancelBtnProps(modalConfirm, { loading: true });
+                onOk()
+                    .then(function () {
+                    setCancelBtnProps(modalConfirm, { loading: false, open: false });
+                })
+                    .catch(function (err) {
+                    setCancelBtnProps(modalConfirm, { loading: false, open: true });
+                });
+            }
+            : undefined }));
+    return modalConfirm;
+};
 ModalComponent.displayName = "ZTXK_WEBUI_ModalComponent";
 ModalComponent.info = Modal$1.info;
 ModalComponent.success = Modal$1.success;
 ModalComponent.error = Modal$1.error;
 ModalComponent.warning = Modal$1.warning;
-ModalComponent.confirm = Modal$1.confirm;
+ModalComponent.confirm = ModalConfirm;
 ModalComponent.destroyAll = Modal$1.destroyAll;
 
 export { ModalComponent as default };

package/dist/es/table/components/EnhanceBodyCell.js

@@ -68,7 +68,8 @@ var EnhanceCell = function (props) {
                             addErrorClass();
                             setShowPopover({
                                 open: true,
-                                message: err_1 === null || err_1 === void 0 ? void 0 : err_1.errors,
+                                // 应该只需要errors字段，但是很多人都没有按照规范传入指定的字段
+                                message: (err_1 === null || err_1 === void 0 ? void 0 : err_1.errors) || (err_1 === null || err_1 === void 0 ? void 0 : err_1.msg) || (err_1 === null || err_1 === void 0 ? void 0 : err_1.message),
                             });
                             return [3 /*break*/, 3];
                         case 3: return [2 /*return*/];

package/dist/es/table/interface.d.ts

@@ -27,6 +27,16 @@ interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
      */
     [props: string]: any;
 }
+interface ValidateErrorObject {
+    /** 这个必传，但是为了兼容之前的逻辑 无奈这么做 */
+    errors?: string;
+    /**
+     * @deprecated 这个类型即将被废弃，不要使用。本身文档里面就是需要用errors表示错误信息的.
+     */
+    msg?: string;
+    /** 其他任何值，当你需要的时候 */
+    [props: string]: any;
+}
 interface IColumnType<RecordType> extends ColumnType<RecordType> {
     /**
      * 是否禁止取消显示
@@ -294,4 +304,4 @@ interface IOrder {
     order: "ascend" | "descend" | undefined;
 }
 
-export { IColumnGroupType, IColumnType, IColumnsType, IColumnsTypeProp, IEditableConfig, IFields, IOrder, ISummaryConfig, ITableProps, TableComponent };
+export { IColumnGroupType, IColumnType, IColumnsType, IColumnsTypeProp, IEditableConfig, IFields, IOrder, ISummaryConfig, ITableProps, TableComponent, ValidateErrorObject };

package/dist/es/table/useColumns.js

@@ -168,7 +168,9 @@ function useColumns(columns, options) {
         // 如果配置了增减行
         if (isAdd || isDel) {
             var newColumn = {
-                title: function () { return (isDelAll ? jsx(ColumnDelAll, {}) : null); },
+                title: function () {
+                    return isDelAll ? jsx(ColumnDelAll, { onAddAndDel: onAddAndDel }) : null;
+                },
                 width: 52,
                 fixed: "left",
                 align: "center",
@@ -183,7 +185,7 @@ function useColumns(columns, options) {
         // 处理一些配置放置的位置
         if (dynamicKey && !hiddenDynamicIcon) {
             myNewColumns[0].title = function () {
-                return isAdd || isDel ? (jsxs(Fragment, { children: [isDelAll ? jsx(ColumnDelAll, {}) : null, jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef })] })) : (jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef }));
+                return isAdd || isDel ? (jsxs(Fragment, { children: [isDelAll ? jsx(ColumnDelAll, { onAddAndDel: onAddAndDel }) : null, jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef })] })) : (jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef }));
             };
         }
     }

package/dist/index.build.d.ts

@@ -38,7 +38,7 @@ export { default as Placeholder } from './es/placeholder/placeholder.js';
 export { Affix, Alert, Anchor, AutoComplete, Avatar, BackTop, Badge, Breadcrumb, Card, Carousel, Cascader, Checkbox, Col, Comment, ConfigProvider, Divider, Drawer, Dropdown, Empty, Grid, Image, Layout, List, Mentions, Menu, PageHeader, Popconfirm, Popover, Progress, Radio, Rate, Result, Row, Segmented, Skeleton, Slider, Space, Spin, Statistic, Steps, Switch, Timeline, Tooltip, Transfer, Typography, Upload, message, notification } from 'antd';
 export { IModalOpenOptions, IModalProps, IModalRef } from './es/modal/interface.js';
 export { IFooterDom, IFooterProps } from './es/footer/interface.js';
-export { IColumnsType, ITableProps } from './es/table/interface.js';
+export { IColumnsType, ITableProps, ValidateErrorObject } from './es/table/interface.js';
 export { IFormItemProps, IProFormProps } from './es/form/interface.js';
 export { IOperationBtn } from './es/operationbtn/interface.js';
 export { ISelectProps } from './es/select/interface.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "0.0.97",
+  "version": "0.0.99",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",