zmdms-webui 0.0.4 → 0.0.6

package/README.md

@@ -1,6 +1,6 @@
 # zmdms-webui
 
-基于antd4.24.8版本二开组件库，通过rollup打包。
+基于 antd4.24.8 版本二开组件库，通过 rollup 打包。
 
 # 使用国际化
 
@@ -9,7 +9,7 @@
    ```
    // 引入获取语言配置的hook
    import useLocale from '../config/useLocale';
-   
+
    const localeConfig = useLocale(); // 能获取到配置在config/i18n下的语言配置相关信息
    ```
 
@@ -18,7 +18,7 @@
    ```
    因为我们组件是基于antd的做的二次开发，由于antd的国际化配置是通过ConfigProvider这个context.provider。但是并没有暴露给用户获取。所以需要额外定义一个切换的context供组件获取
    import { ConfigProvider, ZtxkContext } from 'ztxk-webui'
-   
+
    <ConfigProvider locale={locale}>
        <ZtxkContext.Provider value={ztxkConfig}>
        	<App />
@@ -30,7 +30,7 @@
 
 # 注意事项
 
-1. 需要覆盖下webpack5下的限制
+1. 需要覆盖下 webpack5 下的限制
 
    ```
    启用后，你若在 .mjs 文件或其他 .js 文件中导入模块，并且它们最近的 package.json 中包含 "type" 字段，其值为 "module"时，你应为此文件提供扩展名，否则 webpack 会提示 Module not found 的错误且编译失败。并且 webpack 不会解析 resolve.mainFiles 中定义的文件目录，你必须自己指定文件名。
@@ -49,10 +49,10 @@
    };
    ```
 
-2. 开发时 添加less支持 （less-loader 需要用10.2.0以下的版本）
+2. 开发时 添加 less 支持 （less-loader 需要用 10.2.0 以下的版本）
 
    ```
-   
+   // 进入 react-scripts/config/webpack.config.js
                {
                  test: /\.(less)$/,
                  exclude: /\.module\.(less)$/,
@@ -84,21 +84,31 @@
                  sideEffects: true,
                },
    ```
-   
-3. 本地link需要注意事项
+
+3. 本地 link 需要注意事项
 
    ```
    Invalid hook call. Hooks can only be called inside of the body of a function component. This could happen for one of the following reasons:
    1. You might have mismatching versions of React and the renderer (such as React DOM)
    2. You might be breaking the Rules of Hooks
    3. You might have more than one copy of React in the same app
-   See https://reactjs.org/link/invalid-hook-call for tips about how to debug and fix this problem. 
-   
+   See https://reactjs.org/link/invalid-hook-call for tips about how to debug and fix this problem.
+
    需要切换到ui库下面，将react link到开发项目的node modules下
-   
+
    cd zmdms-webui
    npm link ..\zmdms-webmain\node_modules\react
    ```
 
-   
+- 使用 link 后报如下错误，可能是 lock 文件中 有 file:引用本地文件导致的错误
+  删除对应的引用即可
+
+````
+ ode:events:491
+   throw er; // Unhandled 'error' event
+   ^
 
+ Error: EISDIR: illegal operation on a directory, read
+ Emitted 'error' event on ReadStream instance at:
+ ```
+````

package/dist/es/_virtual/_tslib.js

@@ -38,6 +38,44 @@ function __rest(s, e) {
     return t;
 }
 
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    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 (g && (g = 0, op[0] && (_ = 0)), _) 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 };
+    }
+}
+
 function __spreadArray(to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -48,4 +86,4 @@ function __spreadArray(to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 }
 
-export { __assign, __rest, __spreadArray };
+export { __assign, __awaiter, __generator, __rest, __spreadArray };

package/dist/es/button/button.d.ts

@@ -1,9 +1,11 @@
 import React__default from 'react';
 import { ButtonProps } from 'antd/es/button';
 
-interface IProps extends ButtonProps {
-    /** 是否开启防止重复点击行为 默认开启 */
-    agentClick?: boolean;
+interface IProps extends Omit<ButtonProps, "onClick"> {
+    onClick?: (event: React__default.MouseEvent<HTMLElement, MouseEvent>, currentBtn: ICurrentBtn) => void;
+}
+interface ICurrentBtn {
+    canClick: boolean;
 }
 declare const Button: React__default.FC<IProps>;
 

package/dist/es/button/button.js

@@ -1,36 +1,25 @@
 import { __rest, __assign } from '../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { useRef } from 'react';
 import { Button as Button$1 } from 'antd';
 import classNames from '../node_modules/classnames/index.js';
 
-var maxClickTime = 300;
 var Button = function (props) {
     var _a;
-    var _b = props.agentClick, agentClick = _b === void 0 ? true : _b, type = props.type, className = props.className, disabled = props.disabled, size = props.size, danger = props.danger, onClick = props.onClick, resetProps = __rest(props, ["agentClick", "type", "className", "disabled", "size", "danger", "onClick"]);
-    var startTimeRef = useRef(0);
+    var type = props.type, className = props.className, disabled = props.disabled, size = props.size, danger = props.danger, onClick = props.onClick, resetProps = __rest(props, ["type", "className", "disabled", "size", "danger", "onClick"]);
     var classes = classNames("zt-btn", className, (_a = {},
         _a["zt-btn-".concat(type)] = type,
         _a["zt-btn-disabled"] = disabled,
         _a["zt-btn-".concat(size)] = size,
         _a["zt-btn-dangerous"] = danger,
         _a));
+    var currentBtn = {
+        canClick: true,
+    };
     var myOnClick = function (event) {
-        if (agentClick) {
-            var nowDateTime = Date.now();
-            if (startTimeRef.current === 0 ||
-                nowDateTime - startTimeRef.current > maxClickTime) {
-                startTimeRef.current = nowDateTime;
-                onClick && onClick(event);
-            }
-            else {
-                startTimeRef.current = nowDateTime;
-                console.log("点击按钮过于频繁");
-            }
-        }
-        else {
-            onClick && onClick(event);
+        if (!currentBtn.canClick) {
+            return;
         }
+        onClick && onClick(event, currentBtn);
     };
     return (jsx(Button$1, __assign({ className: classes, type: type, disabled: disabled, size: size, danger: danger, onClick: myOnClick }, resetProps)));
 };

package/dist/es/detaillist/index.d.ts

@@ -0,0 +1,5 @@
+import DetailList from './list.js';
+
+
+
+export { DetailList as default };

package/dist/es/detaillist/index.js

@@ -0,0 +1,5 @@
+import DetailList from './list.js';
+
+
+
+export { DetailList as default };

package/dist/es/detaillist/item.d.ts

@@ -0,0 +1,21 @@
+import React__default from 'react';
+import { ColProps } from 'antd/lib/col';
+
+interface IProps extends ColProps {
+    title: string;
+    colon?: boolean;
+    span: number;
+    titleSpan?: number;
+    titleProps?: any;
+    /** 多余得属性 */
+    textProps?: any;
+    /**是否显示差别 */
+    showDiff?: boolean;
+    /** 是否添加超出隐藏 */
+    isEllipsis?: boolean;
+    /** 是否加粗 */
+    isBlod?: boolean;
+}
+declare const Item: React__default.FC<IProps>;
+
+export { IProps, Item as default };

package/dist/es/detaillist/item.js

@@ -0,0 +1,26 @@
+import { __assign } from '../_virtual/_tslib.js';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import classNames from '../node_modules/classnames/index.js';
+import { Col } from 'antd';
+
+var Item = function (_a) {
+    var children = _a.children, className = _a.className, title = _a.title, _b = _a.colon, colon = _b === void 0 ? true : _b, span = _a.span, titleSpan = _a.titleSpan, titleProps = _a.titleProps, textProps = _a.textProps, showDiff = _a.showDiff, _c = _a.isEllipsis, isEllipsis = _c === void 0 ? true : _c, isBlod = _a.isBlod;
+    var classes = classNames("ztxk-grid-item", className);
+    return (jsxs(Fragment, { children: [jsxs(Col, __assign({ className: classes + " ztxk-grid-item--title", 
+                // span={titleSpan ? titleSpan : Math.ceil(span * 0.3)}
+                span: titleSpan ? titleSpan : 3, title: title }, titleProps, { children: [jsx("span", __assign({ className: "ztxk-grid-item--title-text" }, { children: title })), jsx("span", __assign({ className: "ztxk-grid-item--title-colon" }, { children: colon && "：" }))] })), jsx(Col, __assign({ className: showDiff
+                    ? classes +
+                        " ztxk-grid-item--text ztxk-grid-item--diff" +
+                        "".concat(isEllipsis
+                            ? " ztxk-grid-item--text-ellipsis"
+                            : " ztxk-grid-item--text-noellipsis")
+                    : classes +
+                        " ztxk-grid-item--text" +
+                        "".concat(isEllipsis
+                            ? " ztxk-grid-item--text-ellipsis"
+                            : " ztxk-grid-item--text-noellipsis"), 
+                // span={titleSpan ? span - titleSpan : span - Math.ceil(span * 0.3)}
+                span: titleSpan ? span - titleSpan : span - 3, title: typeof children === "string" ? children : undefined, style: { fontWeight: isBlod ? "bold" : "normal" } }, textProps, { children: children }))] }));
+};
+
+export { Item as default };

package/dist/es/detaillist/list.d.ts

@@ -0,0 +1,15 @@
+import React__default from 'react';
+import { RowProps } from 'antd/lib/row';
+import Item from './item.js';
+
+interface IListProps extends RowProps {
+    border?: boolean;
+    isBg?: boolean;
+}
+interface ListComponent extends React__default.FC<IListProps> {
+    Item: typeof Item;
+    displayName: string;
+}
+declare const DetailList: ListComponent;
+
+export { IListProps, DetailList as default };

package/dist/es/detaillist/list.js

@@ -0,0 +1,19 @@
+import { __rest, __assign } from '../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import classNames from '../node_modules/classnames/index.js';
+import Item from './item.js';
+import { Row } from 'antd';
+
+var List = function (_a) {
+    var children = _a.children, className = _a.className, border = _a.border, isBg = _a.isBg, restProps = __rest(_a, ["children", "className", "border", "isBg"]);
+    var classes = classNames("ztxk-grid", className, {
+        "ztxk-grid--border": border,
+        "ztxk-grid--background": isBg,
+    });
+    return (jsx(Row, __assign({ className: classes }, restProps, { gutter: 0 }, { children: children })));
+};
+var DetailList = List;
+DetailList.displayName = "ZTXK_WEBUI_DetailList";
+DetailList.Item = Item;
+
+export { DetailList as default };

package/dist/es/dynamicsetting/dynamicSetting.d.ts

@@ -1,6 +1,6 @@
 import React__default from 'react';
-import { IDynamicSettingProps } from './interface.js';
+import { IDynamicSettingProps, IRef } from './interface.js';
 
-declare const _default: React__default.MemoExoticComponent<React__default.ForwardRefExoticComponent<IDynamicSettingProps & React__default.RefAttributes<unknown>>>;
+declare const _default: React__default.MemoExoticComponent<React__default.ForwardRefExoticComponent<IDynamicSettingProps & React__default.RefAttributes<IRef>>>;
 
 export { _default as default };

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

@@ -13,6 +13,11 @@ interface IDynamicSettingProps {
     children?: JSX.Element;
     title?: string;
     hiddenOperationIcon?: boolean;
+}
+interface IRef {
+    getCurrentDynamicList: (list: IDynamicItem[]) => IDynamicItem[];
+    setList: React.Dispatch<React.SetStateAction<IDynamicItem[]>>;
+    setVisible: (v: boolean) => void;
 }
 
-export { IDynamicItem, IDynamicSettingProps };
+export { IDynamicItem, IDynamicSettingProps, IRef };

package/dist/es/dynamicsetting/useDynamic.js

@@ -25,12 +25,14 @@ function getCurrentDynamicItems(dynamicKey, parentDynamicKey, list) {
         }
         else {
             // 如果缓存中有值，那么以缓存中的值为准
+            // key保留 其他内容替换
             list.forEach(function (item, index) {
                 var result = __assign({ checked: true }, item);
                 // 将最新的名字等同步
                 // 如果之前有数据，那么需要验证数据的准确性，比如修改了名字但是key没替换
                 var currentData = currentDynamicList_1.find(function (currentDynamic) { return currentDynamic.key === result.key; });
                 if (currentData) {
+                    currentData.label = result.label;
                     currentData.isFind = true; // 代表当前这个字段被找到
                 }
                 else {

package/dist/es/footer/footer.js

@@ -18,7 +18,7 @@ var Footer = function (props) {
         } }, { children: footerDom ? (jsxs("div", __assign({ className: "ztxk-footer--group" }, { children: [footerDom.map(function (item, index) {
                     var DOMType = item.DOMType, render = item.render;
                     if (DOMType === "button") {
-                        var type = item.type, loading = item.loading, disabled = item.disabled, onClick = item.onClick;
+                        var _a = item.type, type = _a === void 0 ? "primary" : _a, loading = item.loading, disabled = item.disabled, onClick = item.onClick;
                         return (jsx(Button, __assign({ type: type, loading: loading, disabled: disabled, onClick: onClick }, { children: item.text }), index));
                     }
                     if (DOMType === "pagination") {

package/dist/es/forgetpassword/forgetPassword.js

@@ -1,8 +1,8 @@
 import { jsx } from 'react/jsx-runtime';
-import { Modal } from 'antd';
+import ModalComponent from '../modal/modal.js';
 
 var ForgetPassword = function () {
-    return jsx(Modal, {});
+    return jsx(ModalComponent, {});
 };
 ForgetPassword.displayName = "ZTXK_WEBUI_ForgetPassword";
 

package/dist/es/form/detaultDom.js

@@ -0,0 +1,11 @@
+import { __assign } from '../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import { memo } from 'react';
+
+var DefaultDom = function (_a) {
+    var children = _a.children, value = _a.value;
+    return (jsx("div", __assign({ className: "ztxk-form--detault-dom" }, { children: children ? children : value })));
+};
+var DefaultDom$1 = memo(DefaultDom);
+
+export { DefaultDom$1 as default };

package/dist/es/form/form.d.ts

@@ -10,6 +10,7 @@ interface FormComponent extends React__default.FC<IProFormProps> {
     Provider: typeof Form.Provider;
     useFormInstance: typeof Form.useFormInstance;
     useWatch: typeof Form.useWatch;
+    DefaultDom: any;
 }
 declare const MemoForm: FormComponent;
 

package/dist/es/form/form.js

@@ -3,8 +3,9 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { memo, useMemo, useCallback } from 'react';
 import { Form as Form$1 } from 'antd';
 import classNames from '../node_modules/classnames/index.js';
-import { useFormConfigInfoCreateNewItems, useDynamicListByItems, useBtnHandle } from './hooks.js';
+import { useFormPreferencesCreateNewItems, useDynamicListByItems, useBtnHandle } from './hooks.js';
 import FormItems from './formItems.js';
+import DefaultDom from './detaultDom.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 import Button from '../button/button.js';
 
@@ -17,14 +18,15 @@ var FORM_DYNAMIC_KEY = "ztxk-webui-dynamic-form";
 // 用户配置优先，先从远端获取到 表单配置信息。
 // 给子元素设置好了表单配置信息后 接下来的内容 交给动态列配置接管
 var Form = function (props) {
-    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, formConfigInfo = props.formConfigInfo, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "formConfigInfo", "items", "outsideState", "onValuesChange", "onResetHandle", "onSearchHandle"]);
+    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, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "formPreferences", "items", "outsideState", "onValuesChange", "onResetHandle", "onSearchHandle", "type"]);
     // 获取新的items
-    var configInfoItems = useFormConfigInfoCreateNewItems(formConfigInfo, items).configInfoItems;
+    var configInfoItems = useFormPreferencesCreateNewItems(formPreferences, items).configInfoItems;
     // 根据items 和 dynamicKey 获取到动态列配置信息
-    var _b = useDynamicListByItems(configInfoItems, dynamicKey, formConfigInfo), dynamicList = _b.dynamicList, onCurrentListChange = _b.onCurrentListChange, newItems = _b.newItems, dynamicSettingRef = _b.dynamicSettingRef;
+    var _b = useDynamicListByItems(configInfoItems, dynamicKey, formPreferences), dynamicList = _b.dynamicList, onCurrentListChange = _b.onCurrentListChange, newItems = _b.newItems, dynamicSettingRef = _b.dynamicSettingRef;
     // 主容器类名
     var wrapClasses = classNames("ztxk-form", wrapClassName, {
         "ztxk-form--bottom-border": bottomBorder,
+        "ztxk-form--list": type === "list",
     });
     // 左容器类名
     var leftClasses = classNames("ztxk-form__left", leftClassName, {
@@ -84,6 +86,7 @@ MemoForm.List = Form$1.List;
 MemoForm.ErrorList = Form$1.ErrorList;
 MemoForm.Provider = Form$1.Provider;
 MemoForm.useFormInstance = Form$1.useFormInstance;
-MemoForm.useWatch = Form$1.useWatch;
+MemoForm.useWatch = Form$1.useWatch;
+MemoForm.DefaultDom = DefaultDom;
 
 export { FORM_DYNAMIC_KEY, MemoForm as default };

package/dist/es/form/formItems.js

@@ -1,5 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx, Fragment } from 'react/jsx-runtime';
+import { memo } from 'react';
 import FormItem from '../formitem/formItem.js';
 
 var FormItems = function (props) {
@@ -9,6 +10,7 @@ var FormItems = function (props) {
                 return (jsx(FormItem, __assign({ index: index }, item, { outsideState: outsideState }), "".concat(item.name)));
             })
             : null }));
-};
+};
+var FormItems$1 = memo(FormItems);
 
-export { FormItems as default };
+export { FormItems$1 as default };

package/dist/es/form/hooks.js

@@ -4,22 +4,22 @@ import { getCurrentDynamicItems } from '../dynamicsetting/useDynamic.js';
 import { FORM_DYNAMIC_KEY } from './form.js';
 
 // 根据表单配置信息 及 表单项items 生成新的表单项items
-function useFormConfigInfoCreateNewItems(formConfigInfo, items) {
+function useFormPreferencesCreateNewItems(formPreferences, items) {
     var configInfoItems = useMemo(function () {
-        if (formConfigInfo) {
+        if (formPreferences) {
             return items === null || items === void 0 ? void 0 : items.map(function (item) {
                 var _a, _b, _c;
                 var name = item.name, configName = item.configName;
                 var key = configName || name;
-                return __assign(__assign({}, item), { isDisplay: (_a = formConfigInfo[key]) === null || _a === void 0 ? void 0 : _a.isDisplay, isRequired: (_b = formConfigInfo[key]) === null || _b === void 0 ? void 0 : _b.isRequired, isChangeable: (_c = formConfigInfo[key]) === null || _c === void 0 ? void 0 : _c.isChangeable });
+                return __assign(__assign({}, item), { isDisplay: (_a = formPreferences[key]) === null || _a === void 0 ? void 0 : _a.isDisplay, isRequired: (_b = formPreferences[key]) === null || _b === void 0 ? void 0 : _b.isRequired, isChangeable: (_c = formPreferences[key]) === null || _c === void 0 ? void 0 : _c.isChangeable });
             });
         }
         return items;
-    }, [formConfigInfo, items]);
+    }, [formPreferences, items]);
     return { configInfoItems: configInfoItems };
 }
 // 根据新的表单项items 经过 dynamic处理后 得到最新的配置信息
-function useDynamicListByItems(items, dynamicKey, formConfigInfo) {
+function useDynamicListByItems(items, dynamicKey, formPreferences) {
     // 动态列配置手动刷新基础配置
     var dynamicSettingRef = useRef({});
     // 根据子元素生成动态列配置信息
@@ -44,11 +44,11 @@ function useDynamicListByItems(items, dynamicKey, formConfigInfo) {
     // 如果表单配置信息发生改变，那么重置下初始化值
     useEffect(function () {
         var _a, _b;
-        if (formConfigInfo && dynamicKey) {
+        if (formPreferences && dynamicKey) {
             (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.setList) === null || _b === void 0 ? void 0 : _b.call(_a, dynamicList);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [formConfigInfo, dynamicKey]);
+    }, [formPreferences, dynamicKey]);
     // 变化的动态列配置信息
     var _a = useState(function () {
         return getCurrentDynamicItems(dynamicKey, FORM_DYNAMIC_KEY, dynamicList);
@@ -102,4 +102,4 @@ function useBtnHandle(form, handleObj) {
     };
 }
 
-export { useBtnHandle, useDynamicListByItems, useFormConfigInfoCreateNewItems };
+export { useBtnHandle, useDynamicListByItems, useFormPreferencesCreateNewItems };

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

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd/lib/form';
 import { IFormItem } from '../formitem/formItem.js';
 
-interface IFormConfigInfo {
+interface IFormPreferences {
     isRequired?: boolean | number;
     isChangeable?: boolean | number;
     isDisplay?: boolean | number;
@@ -10,6 +10,7 @@ interface IFormItemProps extends IFormItem {
 }
 interface IProFormProps extends FormProps {
     bottomBorder?: boolean;
+    type?: "default" | "list";
     isFlex?: boolean;
     wrapClassName?: string;
     leftClassName?: string;
@@ -25,8 +26,8 @@ interface IProFormProps extends FormProps {
      */
     onSearchHandle?: any;
     dynamicKey?: string;
-    formConfigInfo?: {
-        [prop: string]: IFormConfigInfo;
+    formPreferences?: {
+        [prop: string]: IFormPreferences;
     };
     items?: IFormItemProps[];
     children?: any;
@@ -36,4 +37,4 @@ interface IProFormProps extends FormProps {
     outsideState?: any;
 }
 
-export { IFormConfigInfo, IFormItemProps, IProFormProps };
+export { IFormItemProps, IFormPreferences, IProFormProps };

package/dist/es/formitem/formItem.js

@@ -5,6 +5,7 @@ import classNames from '../node_modules/classnames/index.js';
 import '../config/ZtxkContext.js';
 import isEqual from '../config/isEqual.js';
 import MemoForm from '../form/form.js';
+import { Col } from 'antd';
 
 var FormItem = function (props) {
     var _a;
@@ -84,26 +85,42 @@ var FormItem = function (props) {
     }
     return (jsxs(ItemWrap, __assign({ width: width, className: className }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render ? render(itemProps, form) : children })), nextNode ? nextNode : null] })));
 };
-function getWidthStr(width) {
+// function getWidthStr(width: IWidth | undefined) {
+//   switch (width) {
+//     case "half":
+//       return "16.66%";
+//     case "all":
+//       return "100%";
+//     case "double":
+//       return "66.66%";
+//     case "halfAll":
+//       return "50%";
+//     default:
+//       return "33.33%";
+//   }
+// }
+function getWidthNum(width) {
     switch (width) {
         case "half":
-            return "16.66%";
+            return 12;
         case "all":
-            return "100%";
+            return 24;
         case "double":
-            return "66.66%";
+            return 16;
         case "halfAll":
-            return "50%";
+            return 12;
         default:
-            return "33.33%";
+            return 8;
     }
 }
 function ItemWrap(props) {
     var className = props.className, children = props.children, width = props.width;
     var itemClasses = classNames("ztxk-form__item--wrap", className);
-    return (jsx("div", __assign({ className: itemClasses, style: {
-            width: getWidthStr(width),
-        } }, { children: children })));
+    return (jsx(Col, __assign({ className: itemClasses, 
+        // style={{
+        //   width: getWidthStr(width),
+        // }}
+        span: getWidthNum(width) }, { children: children })));
 }
 FormItem.displayName = "ZTXK_WEBUI_FormItem";
 // export default FormItem;

package/dist/es/login/index.d.ts

@@ -8,6 +8,7 @@ interface IProps {
     loginLogo?: string;
     loginBg?: string;
     onFinishHandle?: (values: any) => void;
+    loading?: boolean;
 }
 declare const Login: React__default.FC<IProps>;
 

package/dist/es/login/index.js

@@ -7,7 +7,7 @@ import Button from '../button/button.js';
 
 var Item = Form.Item;
 var Login = function (props) {
-    var loginLogo = props.loginLogo, loginBg = props.loginBg, onFinishHandle = props.onFinishHandle;
+    var loginLogo = props.loginLogo, loginBg = props.loginBg, onFinishHandle = props.onFinishHandle, loading = props.loading;
     var form = Form.useForm()[0];
     var onFinish = function (values) {
         // 内部处理
@@ -23,7 +23,7 @@ var Login = function (props) {
                             required: true,
                             message: "请输入您的密码",
                         },
-                    ] }, { children: jsx(MemoInput.Password, { size: "large", prefix: jsx(IconFont, { type: "icon-mima", style: { fontSize: "14px", color: "rgba(0,0,0,.65)" } }) }) })), jsx(Item, { children: jsx(Button, __assign({ htmlType: "submit", block: true, className: "form__item--button" }, { children: "\u767B\u5F55" })) }), jsxs("div", __assign({ className: "form__item--remember" }, { children: [jsx(Item, __assign({ name: "remember", valuePropName: "checked" }, { children: jsx(Checkbox, { children: "\u8BB0\u4F4F\u5BC6\u7801" }) })), jsx("div", __assign({ className: "form__item--remember-forget" }, { children: "\u5FD8\u8BB0\u5BC6\u7801" }))] }))] })) })));
+                    ] }, { children: jsx(MemoInput.Password, { size: "large", prefix: jsx(IconFont, { type: "icon-mima", style: { fontSize: "14px", color: "rgba(0,0,0,.65)" } }) }) })), jsx(Item, { children: jsx(Button, __assign({ htmlType: "submit", block: true, className: "form__item--button", loading: loading }, { children: "\u767B\u5F55" })) }), jsxs("div", __assign({ className: "form__item--remember" }, { children: [jsx(Item, __assign({ name: "remember", valuePropName: "checked" }, { children: jsx(Checkbox, { children: "\u8BB0\u4F4F\u5BC6\u7801" }) })), jsx("div", __assign({ className: "form__item--remember-forget" }, { children: "\u5FD8\u8BB0\u5BC6\u7801" }))] }))] })) })));
 };
 Login.displayName = "ZTXK_WEBUI_Login";
 

package/dist/es/modal/index.d.ts

@@ -0,0 +1,5 @@
+import ModalComponent from './modal.js';
+
+
+
+export { ModalComponent as default };

package/dist/es/modal/index.js

@@ -0,0 +1,5 @@
+import ModalComponent from './modal.js';
+
+
+
+export { ModalComponent as default };

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

@@ -0,0 +1,16 @@
+import { ModalProps } from 'antd/lib/modal';
+import React__default from 'react';
+import { Modal } from 'antd';
+
+interface IModalProps extends ModalProps {
+    defaultOpen?: boolean;
+}
+interface IModalComponent extends React__default.ForwardRefExoticComponent<IModalProps & React__default.RefAttributes<unknown>> {
+    info: typeof Modal.info;
+    success: typeof Modal.success;
+    error: typeof Modal.error;
+    warning: typeof Modal.warning;
+    confirm: typeof Modal.confirm;
+}
+
+export { IModalComponent, IModalProps };