zmdms-webui 1.2.1 → 1.2.3

package/dist/es/button/buttonExport.js

@@ -43,7 +43,7 @@ var ButtonExport = function (props) {
                     exportBolb(res, fileName)
                         .then(function (r) {
                         if (r.result) {
-                            message.info(r.msg);
+                            message.success(r.msg);
                         }
                         onClick && onClick(e, { result: true });
                     })

package/dist/es/table/utils.js

@@ -123,7 +123,7 @@ function copyColData(key, dataSource) {
         try {
             if ((navigator === null || navigator === void 0 ? void 0 : navigator.clipboard) && window.isSecureContext) {
                 (_b = (_a = navigator.clipboard) === null || _a === void 0 ? void 0 : _a.writeText(str)) === null || _b === void 0 ? void 0 : _b.then(function () {
-                    message.info("复制成功！");
+                    message.success("复制成功！");
                 });
             }
             else {
@@ -132,7 +132,7 @@ function copyColData(key, dataSource) {
                 document.body.appendChild(textarea);
                 textarea.select();
                 if (document.execCommand) {
-                    message.info("复制成功！");
+                    message.success("复制成功！");
                     document.execCommand("copy");
                 }
                 else {

package/dist/es/zttransfer/Container.js

@@ -7,15 +7,13 @@ import { ZtTransferContext } from './context.js';
 
 var Container = function (props) {
     var _a = props.mode, mode = _a === void 0 ? "multiple" : _a, value = props.value, completeValue = props.completeValue, onChange = props.onChange, onSearch = props.onSearch, parseCheckedItem = props.parseCheckedItem, parseSearchItem = props.parseSearchItem, children = props.children;
-    var key = useContext(ZtTransferContext).fieldNames.key;
+    var _b = useContext(ZtTransferContext).fieldNames, key = _b.key, title = _b.title;
     // 删除已选中
     var onClearIndex = useCallback(function (index, item) {
-        var newValue = value.slice();
-        var newCompleteValue = completeValue.slice();
-        newValue.splice(index, 1);
-        newCompleteValue.splice(index, 1);
+        var newValue = value.filter(function (i) { return (item === null || item === void 0 ? void 0 : item[key]) !== i; });
+        var newCompleteValue = completeValue.filter(function (i) { return (item === null || item === void 0 ? void 0 : item[key]) !== (i === null || i === void 0 ? void 0 : i[key]); });
         onChange && onChange(newValue, newCompleteValue);
-    }, [onChange, value, completeValue]);
+    }, [onChange, value, completeValue, key]);
     //
     var onSearchChange = useCallback(function (searchValue, searchCompleteValue, deleteValue) {
         if (searchValue) {
@@ -35,9 +33,19 @@ var Container = function (props) {
             onChange && onChange(newValue, newCompleteValue);
         }
     }, [mode, value, completeValue, onChange, key]);
-    return (jsx("div", __assign({ className: "container" }, { children: mode === "multiple" ? (jsxs(Fragment, { children: [jsx(SelectContainer, __assign({ title: "\u53EF\u9009", onSearch: onSearch, parseSearchItem: parseSearchItem, value: value, onChange: onSearchChange, mode: mode }, { children: children ? (children({ value: value, completeValue: completeValue, onChange: onChange })) : (jsx("div", { children: "1" })) })), jsx(SelectContainer, __assign({ title: "\u5DF2\u9009", checkedLength: (value === null || value === void 0 ? void 0 : value.length) || 0, allowClear: true, onClear: function () {
+    // 已选过滤
+    var onCheckedFilter = useCallback(function (value) {
+        return ((completeValue === null || completeValue === void 0 ? void 0 : completeValue.filter(function (itemValue, index) {
+            var _a, _b;
+            var newItem = parseCheckedItem
+                ? parseCheckedItem(itemValue, index)
+                : itemValue;
+            return ((_b = (_a = newItem === null || newItem === void 0 ? void 0 : newItem[title]) === null || _a === void 0 ? void 0 : _a.indexOf) === null || _b === void 0 ? void 0 : _b.call(_a, value)) !== -1;
+        })) || []);
+    }, [completeValue, parseCheckedItem, title]);
+    return (jsx("div", __assign({ className: "container" }, { children: mode === "multiple" ? (jsxs(Fragment, { children: [jsx(SelectContainer, __assign({ title: "\u53EF\u9009", onSearch: onSearch, parseSearchItem: parseSearchItem, value: value, onChange: onSearchChange, mode: mode }, { children: children ? (children({ value: value, completeValue: completeValue, onChange: onChange })) : (jsx("div", { children: "1" })) })), jsx(SelectContainer, __assign({ title: "\u5DF2\u9009", onSearch: onCheckedFilter, checkedLength: (value === null || value === void 0 ? void 0 : value.length) || 0, allowClear: true, onClear: function () {
                         onChange && onChange([], []);
-                    } }, { children: jsx(CheckedResult, { dataList: completeValue, parseCheckedItem: parseCheckedItem, onClearIndex: onClearIndex }) }))] })) : (jsx(SelectContainer, __assign({ onSearch: onSearch, parseSearchItem: parseSearchItem, value: value, onChange: onSearchChange, mode: mode }, { children: children ? (children({ value: value, completeValue: completeValue, onChange: onChange })) : (jsx("div", { children: "1" })) }))) })));
+                    }, isShow: true, parseCheckedItem: parseCheckedItem, onClearIndex: onClearIndex }, { children: jsx(CheckedResult, { dataList: completeValue, parseCheckedItem: parseCheckedItem, onClearIndex: onClearIndex }) }))] })) : (jsx(SelectContainer, __assign({ onSearch: onSearch, parseSearchItem: parseSearchItem, value: value, onChange: onSearchChange, mode: mode }, { children: children ? (children({ value: value, completeValue: completeValue, onChange: onChange })) : (jsx("div", { children: "1" })) }))) })));
 };
 var Container$1 = memo(Container);
 

package/dist/es/zttransfer/SelectContainer.js

@@ -1,16 +1,27 @@
 import { __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { memo, useState } from 'react';
+import { memo, useState, useContext, useCallback } from 'react';
 import SearchResult from './SearchResult.js';
+import CheckedResult from './CheckedResult.js';
+import { ZtTransferContext } from './context.js';
 import ButtonCom from '../button/button.js';
 import MemoInput from '../input/input.js';
 import { Spin } from 'antd';
 
 var SelectContainer = function (props) {
-    var title = props.title, checkedLength = props.checkedLength, allowClear = props.allowClear, onClear = props.onClear, onSearch = props.onSearch, contentPadding = props.contentPadding, children = props.children, value = props.value, onChange = props.onChange, mode = props.mode;
+    var title = props.title, checkedLength = props.checkedLength, allowClear = props.allowClear, onClear = props.onClear, onSearch = props.onSearch, contentPadding = props.contentPadding, children = props.children, value = props.value, onChange = props.onChange, mode = props.mode, isShow = props.isShow, parseCheckedItem = props.parseCheckedItem, onClearIndex = props.onClearIndex;
     var _a = useState(), searchValue = _a[0], setSearchValue = _a[1];
     var _b = useState(false), spinning = _b[0], setSpinning = _b[1];
     var _c = useState(), searchResult = _c[0], setSearchResult = _c[1];
+    var key = useContext(ZtTransferContext).fieldNames.key;
+    var myOnClearIndex = useCallback(function (index, item) {
+        setSearchResult(function (searchResult) {
+            return searchResult.filter(function (sRItem) {
+                return (item === null || item === void 0 ? void 0 : item[key]) !== (sRItem === null || sRItem === void 0 ? void 0 : sRItem[key]);
+            });
+        });
+        onClearIndex && onClearIndex(index, item);
+    }, [onClearIndex, key]);
     return (jsx("div", __assign({ className: "zt-transfer--container" }, { children: jsxs(Spin, __assign({ spinning: spinning }, { children: [title && (jsxs("div", __assign({ className: "title" }, { children: [jsxs("span", { children: [title, checkedLength ? " (".concat(checkedLength, ")") : null] }), allowClear && (jsx(ButtonCom, __assign({ type: "link", onClick: onClear }, { children: "\u6E05\u7A7A" })))] }))), jsxs("div", __assign({ className: "wrap" }, { children: [jsx(MemoInput.Search, { className: "search", placeholder: "\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22", onSearch: function (v) { return __awaiter(void 0, void 0, void 0, function () {
                                 var data;
                                 return __generator(this, function (_a) {
@@ -40,7 +51,7 @@ var SelectContainer = function (props) {
                                         case 5: return [2 /*return*/];
                                     }
                                 });
-                            }); }, allowClear: true }), jsxs("div", __assign({ className: "content", style: { padding: contentPadding ? 10 : 0 } }, { children: [jsx("div", __assign({ style: { display: searchValue ? "none" : "block" } }, { children: children })), searchValue && (jsx(SearchResult, { value: value, onChange: onChange, dataList: searchResult, mode: mode }))] }))] }))] })) })));
+                            }); }, allowClear: true }), jsxs("div", __assign({ className: "content", style: { padding: contentPadding ? 10 : 0 } }, { children: [jsx("div", __assign({ style: { display: searchValue ? "none" : "block" } }, { children: children })), searchValue ? (isShow ? (jsx(CheckedResult, { dataList: searchResult, parseCheckedItem: parseCheckedItem, onClearIndex: myOnClearIndex })) : (jsx(SearchResult, { value: value, onChange: onChange, dataList: searchResult, mode: mode }))) : null] }))] }))] })) })));
 };
 var SelectContainer$1 = memo(SelectContainer);
 

package/package.json

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