zmdms-webui 0.0.138 → 0.0.139

package/dist/es/button/buttonExport.js

@@ -10,7 +10,7 @@ import { message } from 'antd';
 //   const { headers, ...axiosConfig } = config;
 //   return axios({
 //     headers: {
-//       "Zmdms-Auth": token,
+//       [TOKEN_KEY]: token,
 //       ...headers,
 //     },
 //     responseType: "blob",

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

@@ -1,6 +1,6 @@
 import { __rest, __awaiter, __generator, __assign } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { useState, useEffect } from 'react';
+import { useState, useRef, useCallback, useEffect } from 'react';
 import { useEditing, useIptRef, useTdRef } from './hooks.js';
 import { getInnerIndex } from '../useInnerPagination.js';
 import { getFormatter } from '../../inputnumber/utils.js';
@@ -29,11 +29,20 @@ var EnhanceCell = function (props) {
         open: false,
         message: "",
     }), showPopover = _f[0], setShowPopover = _f[1];
-    var _g = useState(false), isCurrent = _g[0], setIsCurrent = _g[1];
+    // 点击时触发验证
+    // const [isCurrent, setIsCurrent] = useState<boolean>(false);
+    // 20231124 修改逻辑： 点击时不触发 点击只做一个必要条件
+    var isCurrentRef = useRef(false);
+    // 修改验证状态之一
+    var changeCurrentState = useCallback(function (isChange) {
+        // setIsCurrent(isChange);
+        isCurrentRef.current = isChange;
+    }, []);
     var validateLatestRef = useLatest(validate);
     var recordLatestRef = useLatest(newRecord);
     var indexLatestRef = useLatest(index);
     var titleLatestRef = useLatest(title);
+    var dataIndexLatestRef = useLatest(dataIndex);
     // 是否需要校验
     var triggerValidateKeys = (_b = validateLatestRef.current) === null || _b === void 0 ? void 0 : _b.triggerValidateKeys;
     var getTriggerValues = function () {
@@ -45,9 +54,9 @@ var EnhanceCell = function (props) {
     };
     var triggerValues = getTriggerValues();
     useEffect(function () {
-        if (!isCurrent) {
-            return;
-        }
+        // if (!isCurrentRef.current) {
+        //   return;
+        // }
         if (!isRealTimeValidate) {
             return;
         }
@@ -67,6 +76,7 @@ var EnhanceCell = function (props) {
                                     itemRef: recordLatestRef,
                                     indexRef: indexLatestRef,
                                     titleRef: titleLatestRef,
+                                    dataIndexRef: dataIndexLatestRef,
                                 })];
                         case 1:
                             _a.sent();
@@ -95,11 +105,12 @@ var EnhanceCell = function (props) {
         indexLatestRef,
         recordLatestRef,
         titleLatestRef,
+        dataIndexLatestRef,
         val,
         validateLatestRef,
         addErrorClass,
         removeErrorClass,
-        isCurrent,
+        // isCurrent,
         isRealTimeValidate,
         triggerValues,
     ]);
@@ -119,9 +130,9 @@ var EnhanceCell = function (props) {
     };
     // 如果开启编辑 那么内部直接代理
     if (typeof editable === "function" ? editable(newRecord) : editable) {
-        var _h = editableConfig || {
+        var _g = editableConfig || {
             type: "input",
-        }, type = _h.type, max = _h.max, min = _h.min, maxHandle = _h.maxHandle, minHandle = _h.minHandle, disabled = _h.disabled, disabledHandle = _h.disabledHandle, resetEditableConfigProps = __rest(_h, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
+        }, type = _g.type, max = _g.max, min = _g.min, maxHandle = _g.maxHandle, minHandle = _g.minHandle, disabled = _g.disabled, disabledHandle = _g.disabledHandle, resetEditableConfigProps = __rest(_g, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
         var CurrentReactNode = null;
         // 这里将children 替换成val 要显示的值
         // let newChildren: any = children;
@@ -180,7 +191,11 @@ var EnhanceCell = function (props) {
                 console.error(err);
             }
         }
-        return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: editing ? (jsx("div", __assign({ className: "ztxk-table__enhance-cell" }, { children: jsx(Popover, __assign({ trigger: "click", content: showPopover.message, open: showPopover.open, overlayClassName: "error-popover" }, { children: CurrentReactNode })) }))) : (jsx("div", __assign({ className: classNames("ztxk-table__enhance-cell-wrap", {
+        return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: editing ? (jsx("div", __assign({ className: "ztxk-table__enhance-cell" }, { children: jsx(Popover
+                // trigger="click"
+                , __assign({ 
+                    // trigger="click"
+                    content: showPopover.message, open: showPopover.open, overlayClassName: "error-popover" }, { children: CurrentReactNode })) }))) : (jsx("div", __assign({ className: classNames("ztxk-table__enhance-cell-wrap", {
                     "ztxk-table__enhance-cell-wrap--disabled": resultDisabled,
                 }), style: {
                     lineHeight: resetEditableConfigProps.rows
@@ -189,47 +204,52 @@ var EnhanceCell = function (props) {
                 }, title: val, onClick: resultDisabled
                     ? undefined
                     : function () {
-                        setIsCurrent(true);
+                        changeCurrentState(true);
                         toggleEdit();
                     } }, { children: newChildren }))) })));
     }
     return (jsx("td", __assign({ ref: tdRef }, resetProps, { onClick: function () {
-            setIsCurrent(true);
+            changeCurrentState(true);
         } }, { children: jsx(Popover
         // 将 click 改成 contextMenu
         // click 会导致 Radio.Group元素 的点击文本选不中选项
+        // trigger="contextMenu"
         , __assign({ 
             // 将 click 改成 contextMenu
             // click 会导致 Radio.Group元素 的点击文本选不中选项
-            trigger: "contextMenu", content: showPopover.message, open: showPopover.open, overlayClassName: "error-popover", onOpenChange: function (open) {
+            // trigger="contextMenu"
+            content: showPopover.message, open: showPopover.open, overlayClassName: "error-popover", onOpenChange: function (open) {
                 setShowPopover(function (pre) {
                     return __assign(__assign({}, pre), { open: open });
                 });
             } }, { children: children })) })));
 };
 function validateHandle(_a) {
-    var validateRef = _a.validateRef, value = _a.value, itemRef = _a.itemRef, indexRef = _a.indexRef, titleRef = _a.titleRef;
+    var validateRef = _a.validateRef, value = _a.value, itemRef = _a.itemRef, indexRef = _a.indexRef, titleRef = _a.titleRef, dataIndexRef = _a.dataIndexRef;
     return __awaiter(this, void 0, void 0, function () {
-        var validate, item, index, title, validateFn, pattern, message, err_2, i, rp;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var validate, item, index, title, dataIndex, validateFn, pattern, message, newItem, err_2, i, rp;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     validate = validateRef.current;
                     item = itemRef.current;
                     index = indexRef.current;
                     title = titleRef.current;
+                    dataIndex = dataIndexRef.current;
                     if (!validate) return [3 /*break*/, 5];
                     validateFn = validate.validate, pattern = validate.pattern, message = validate.message;
                     if (!(typeof validateFn === "function")) return [3 /*break*/, 4];
-                    _b.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, validateFn(value, item, index + 1, title)];
+                    _c.trys.push([1, 3, , 4]);
+                    newItem = item && dataIndex ? __assign(__assign({}, item), (_b = {}, _b[dataIndex] = value, _b)) : item;
+                    return [4 /*yield*/, validateFn(value, newItem, index + 1, title)];
                 case 2:
-                    _b.sent();
+                    _c.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    err_2 = _b.sent();
+                    err_2 = _c.sent();
                     return [2 /*return*/, Promise.reject(err_2)];
                 case 4:
                     // 正则校验

package/dist/es/uploadlist/hooks.js

@@ -1,7 +1,7 @@
 import { __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { useCallback, useState, useEffect, useMemo } from 'react';
 import { flushSync } from 'react-dom';
-import { getFileExtension, isImageExtension, createDownloadLink, createUploadFileLink, getToken, exactRound, times, divide } from 'zmdms-utils';
+import { getFileExtension, isImageExtension, createDownloadLink, createUploadFileLink, TOKEN_KEY, getToken, exactRound, times, divide } from 'zmdms-utils';
 import MemoUploadList from './uploadList.js';
 import { useLatest } from 'ahooks';
 import { message } from 'antd';
@@ -174,7 +174,8 @@ function useBasicInfo(props) {
     var fileAction = action ? action : createUploadFileLink({ API_BASEURL: API_BASEURL });
     // 文件上传头部参数
     var fileHeaders = useMemo(function () {
-        return __assign({ "Zmdms-Auth": getToken() || "" }, headers);
+        var _a;
+        return __assign((_a = {}, _a[TOKEN_KEY] = getToken() || "", _a), headers);
     }, [headers]);
     // 其余参数
     var fileData = useMemo(function () {

package/dist/es/zttransfer/Container.js

@@ -0,0 +1,10 @@
+import { __assign } from '../_virtual/_tslib.js';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import SelectContainer from './SelectContainer.js';
+
+var Container = function (props) {
+    var _a = props.mode, mode = _a === void 0 ? "multiple" : _a;
+    return (jsx("div", __assign({ className: "container" }, { children: mode === "multiple" ? (jsxs(Fragment, { children: [jsx(SelectContainer, { title: "\u53EF\u9009", contentPadding: true }), jsx(SelectContainer, { title: "\u5DF2\u9009", allowClear: true, onClear: function () { } })] })) : (jsx(SelectContainer, { contentPadding: true })) })));
+};
+
+export { Container as default };

package/dist/es/zttransfer/ZtTransfer.js

@@ -0,0 +1,18 @@
+import { __rest, __assign } from '../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import Container from './Container.js';
+import MemoTabs from '../tabs/tabs.js';
+
+var ZtTransfer = function (_a) {
+    var resetProps = __rest(_a, []);
+    var items = [
+        {
+            label: "组织结构",
+            key: "item-1",
+            children: jsx(Container, __assign({}, resetProps)),
+        },
+    ];
+    return (jsx("div", __assign({ className: "zt-transfer" }, { children: jsx(MemoTabs, { items: items, nonBorder: true }) })));
+};
+
+export { ZtTransfer as default };

package/dist/es/zttransfer/index.css

@@ -1 +1 @@
-.zt-transfer--container{border:1px solid #dee9f6;border-radius:4px;width:300px}.zt-transfer--container .title{align-items:center;background-color:#fafafa;border-bottom:1px solid #dee9f6;border-top-left-radius:4px;border-top-right-radius:4px;display:flex;justify-content:space-between;line-height:32px;padding:0 0 0 10px}.zt-transfer--container .title>button{padding:4px 10px}.zt-transfer--container .wrap{display:flex;flex-direction:column;height:400px}.zt-transfer--container .wrap .search{padding:10px}.zt-transfer--container .wrap .search .ant-input{height:30px}.zt-transfer--container .wrap .search .ant-btn{background-color:#fff;border-color:#d9d9d9}.zt-transfer--container .wrap .content{flex:1;overflow:auto}
+.zt-transfer{padding:10px}.zt-transfer .container{display:flex;justify-content:space-between}.zt-transfer--container{border:1px solid #dee9f6;border-radius:4px;width:300px}.zt-transfer--container .title{align-items:center;background-color:#fafafa;border-bottom:1px solid #dee9f6;border-top-left-radius:4px;border-top-right-radius:4px;display:flex;justify-content:space-between;line-height:32px;padding:0 0 0 10px}.zt-transfer--container .title>button{padding:4px 10px}.zt-transfer--container .wrap{display:flex;flex-direction:column;height:400px}.zt-transfer--container .wrap .search{padding:10px}.zt-transfer--container .wrap .search .ant-input{height:30px}.zt-transfer--container .wrap .search .ant-btn{background-color:#fff;border-color:#d9d9d9}.zt-transfer--container .wrap .content{flex:1;overflow:auto}

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

@@ -1,4 +1,4 @@
-import ZtTransfer from './ztTransfer.js';
+import ZtTransfer from './ZtTransfer.js';
 
 
 

package/dist/es/zttransfer/index.js

@@ -1,4 +1,4 @@
-import ZtTransfer from './ztTransfer.js';
+import ZtTransfer from './ZtTransfer.js';
 
 
 

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

@@ -1,6 +1,8 @@
 interface IZtTransferProps {
-    /** 多选模式 */
-    mode?: "multiple";
+    /** 选择模式 默认多选 */
+    mode?: "multiple" | "single";
+    /** 选择渲染函数 */
+    selectRender?: () => void;
 }
 
 export { IZtTransferProps };

package/dist/index.build.d.ts

@@ -39,7 +39,7 @@ export { default as AuthLoading } from './es/authloading/authLoading.js';
 export { default as NotAuthPage } from './es/notauthpage/notAuthPage.js';
 export { default as NotRoutePage } from './es/notroutepage/notRoutePage.js';
 export { default as Alert } from './es/alert/alert.js';
-export { default as ZtTransfer } from './es/zttransfer/ztTransfer.js';
+export { default as ZtTransfer } from './es/zttransfer/ZtTransfer.js';
 export { Affix, 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';