ztxkui 2.6.6 → 2.6.9

package/dist/Demo.js

@@ -15,7 +15,7 @@ function Demo() {
     console.log('rerender');
     var _a = useState([]), list = _a[0], setList = _a[1];
     var _b = useState([]), setDefaultList = _b[1];
-    var _c = useState(''), value = _c[0], setValue = _c[1];
+    var _c = useState(), value = _c[0], setValue = _c[1];
     var params = useState({
         tenantId: '000000',
         isCreateUser: 0,
@@ -83,7 +83,10 @@ function Demo() {
             }), request: request, isCatch: true }),
         React.createElement("h2", null, "\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22"),
         React.createElement("button", { onClick: function () { return setValue('1462433051208762629'); } }, "\u4FEE\u6539"),
-        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", value: value, showAll: true, onChange: function (value, option, fullData) {
+        React.createElement(EnhanceSelect, { style: selectStyle, defaultList: [
+                { id: 1, empName: '21' },
+                { id: 2, empName: '33' },
+            ], placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", value: value, showAll: true, onChange: function (value, option, fullData) {
                 setValue(value);
             }, params: JSON.stringify(params), 
             // value={value}

package/dist/DemoCom/CollapseDemo.js

@@ -21,14 +21,14 @@ function CollapseDemo() {
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"))),
             React.createElement(Collapse.Panel, { key: "2", header: "22" },
                 React.createElement(GridList, null,
+                    React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5saasasass" }, "\u518D\u89C1"),
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
                     React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
-                    React.createElement(GridList.FormItem, { span: 8, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),
-                    React.createElement(GridList.FormItem, { span: 16, titleSpan: Math.floor(8 * 0.4), title: "\u6D4B\u8BD5" }, "\u518D\u89C1"))),
+                    React.createElement(GridList.FormItem, { span: 16, titleSpan: 4, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"))),
             React.createElement(Collapse.Panel, { key: "3", header: "33" },
                 React.createElement(GridList, { border: false, showBackground: false },
                     React.createElement(GridList.FormItem, { span: 6, title: "\u6D4B\u8BD5" }, "\u518D\u89C1"),

package/dist/UploadDemo.js

@@ -43,6 +43,7 @@ function UploadDemo() {
     var _this = this;
     var _a = useState(originFileList), fileList = _a[0], setFileList = _a[1];
     var upload = useRef();
+    var uploadTableRef = useRef();
     useEffect(function () {
         setTimeout(function () {
             setFileList([
@@ -162,6 +163,9 @@ function UploadDemo() {
             }
         });
     }); };
+    var getHandle = function () {
+        console.log(uploadTableRef.current.getSelectedRows());
+    };
     return (React.createElement("div", null,
         React.createElement(Link, { to: "/test" }, "test"),
         React.createElement(Upload, { method: "post", headers: {
@@ -178,7 +182,7 @@ function UploadDemo() {
                 system: '2',
             }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", originFileList: fileList, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
                 console.log(index, file);
-            }, upload: upload }),
+            }, upload: upload, rowSelection: "checkbox", uploadTableRef: uploadTableRef }),
         React.createElement(Upload, { maxSize: 200 * 1024, ztAccept: ['.jpg', '.jpeg', '.png', '.bmp', '.gif'], listType: "picture-card", method: "post", headers: {
                 'Zmdms-Auth': token,
             }, showUploadList: {
@@ -188,6 +192,7 @@ function UploadDemo() {
             }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList, maxCount: 1, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
                 console.log(index, file);
             }, authToken: token }),
-        React.createElement("button", { onClick: checkHandle }, "\u68C0\u67E5")));
+        React.createElement("button", { onClick: checkHandle }, "\u68C0\u67E5"),
+        React.createElement("button", { onClick: getHandle }, "\u83B7\u53D6\u9009\u4E2D\u9879")));
 }
 export default UploadDemo;

package/dist/components/EnhanceSelect/index.js

@@ -77,6 +77,7 @@ function getData(request, options) {
  */
 function EnhanceSelect(_a) {
     var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 10000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "mustHasParams", "disabledValues"]);
+    var currentClick = useRef(true);
     // 下拉数据源
     var _h = useFetchState([]), selectList = _h[0], setSelectList = _h[1];
     // 多选时，自己需要合并的数据
@@ -414,6 +415,12 @@ function EnhanceSelect(_a) {
     };
     // onChange 方法
     var onChangeHandle = function (value, option) {
+        if ((Array.isArray(value) && value.length === 0) || !value) {
+            currentClick.current = true;
+        }
+        else {
+            currentClick.current = false;
+        }
         setFirstLoading(true);
         if (((Array.isArray(value) && value.length === 0) || !value) &&
             remoteSearch &&
@@ -447,12 +454,41 @@ function EnhanceSelect(_a) {
         }
     };
     // 焦点事件
-    var onFocusHandle = function () {
+    var onFocusHandle = function (e) {
+        // console.log('焦点事件');
         setIsOpen(true);
+        currentClick.current = false;
     };
     var onBlurHandle = function () {
+        // console.log('失去焦点事件');
         setIsOpen(false);
+        currentClick.current = false;
+    };
+    // 清空数据时
+    var onClearHandle = function () {
+        // console.log('清空数据事件');
+        setIsOpen(false);
+    };
+    // 选中时
+    var onSelectHandle = function () {
+        // console.log('选中数据事件');
+        if (!restProps.mode) {
+            setIsOpen(false);
+        }
+    };
+    // 点击时
+    var onClickHandle = function (e) {
+        // console.log('点击事件', currentClick.current);
+        if (currentClick.current) {
+            if (isOpen) {
+                setIsOpen(false);
+            }
+            else {
+                setIsOpen(true);
+            }
+        }
+        currentClick.current = true;
     };
-    return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, open: isOpen }, restProps, { disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
+    return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, open: isOpen }, restProps, { disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
 }
 export default memo(EnhanceSelect);

package/dist/components/Upload/upload-table.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TableRowSelection } from '../Table';
 import { UploadFile } from 'antd/lib/upload/interface';
 interface IProps {
     fileList?: UploadFile[];
@@ -26,6 +27,9 @@ interface IProps {
     startColumns?: any;
     otherColumns?: any;
     showUploadBtn?: boolean;
+    /**是否显示selection */
+    rowSelection?: TableRowSelection<any> | 'checkbox' | 'radio';
+    uploadTableRef?: any;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/Upload/upload-table.js

@@ -61,7 +61,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
         to[j] = from[i];
     return to;
 };
-import React, { useState, useEffect, memo } from 'react';
+import React, { useState, useEffect, memo, useMemo, useImperativeHandle, } from 'react';
 import { Button, Progress, message, Popconfirm } from '../../index';
 import Table from '../Table';
 import dayjs from 'dayjs';
@@ -69,9 +69,13 @@ import { divide, round, times } from 'number-precision';
 import { downloadFileCallBack, downloadPublicFile, previewFile, } from 'ztxkutils/dist/fileOperation';
 import { transformFileSize } from 'ztxkutils/dist/tools';
 var UploadTable = function (_a) {
-    var fileList = _a.fileList, action = _a.action, headers = _a.headers, authToken = _a.authToken, method = _a.method, apiBaseUrl = _a.apiBaseUrl, uploadUser = _a.uploadUser, _b = _a.fileBaseUrl, fileBaseUrl = _b === void 0 ? '' : _b, onDelete = _a.onDelete, onUpload = _a.onUpload, showDeleteBtn = _a.showDeleteBtn, isAutoDelete = _a.isAutoDelete, onDownLoadCallbackBefore = _a.onDownLoadCallbackBefore, showDownloadBtn = _a.showDownloadBtn, onDownLoadCallbackAfter = _a.onDownLoadCallbackAfter, onPreviewCallbackBefore = _a.onPreviewCallbackBefore, showPreviewBtn = _a.showPreviewBtn, isPublic = _a.isPublic, data = _a.data, _c = _a.startColumns, startColumns = _c === void 0 ? [] : _c, _d = _a.otherColumns, otherColumns = _d === void 0 ? [] : _d, showUploadBtn = _a.showUploadBtn;
+    var fileList = _a.fileList, action = _a.action, headers = _a.headers, authToken = _a.authToken, method = _a.method, apiBaseUrl = _a.apiBaseUrl, uploadUser = _a.uploadUser, _b = _a.fileBaseUrl, fileBaseUrl = _b === void 0 ? '' : _b, onDelete = _a.onDelete, onUpload = _a.onUpload, showDeleteBtn = _a.showDeleteBtn, isAutoDelete = _a.isAutoDelete, onDownLoadCallbackBefore = _a.onDownLoadCallbackBefore, showDownloadBtn = _a.showDownloadBtn, onDownLoadCallbackAfter = _a.onDownLoadCallbackAfter, onPreviewCallbackBefore = _a.onPreviewCallbackBefore, showPreviewBtn = _a.showPreviewBtn, isPublic = _a.isPublic, data = _a.data, _c = _a.startColumns, startColumns = _c === void 0 ? [] : _c, _d = _a.otherColumns, otherColumns = _d === void 0 ? [] : _d, showUploadBtn = _a.showUploadBtn, rowSelection = _a.rowSelection, uploadTableRef = _a.uploadTableRef;
     var _e = useState([]), dataSource = _e[0], setDataSource = _e[1];
     var _f = useState(false), loading = _f[0], setLoading = _f[1];
+    var _g = useState(), selectedRows = _g[0], setSelectedRows = _g[1];
+    useImperativeHandle(uploadTableRef, function () { return ({
+        getSelectedRows: function () { return selectedRows; },
+    }); }, [selectedRows]);
     var columns = showUploadBtn
         ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], startColumns), [
             {
@@ -401,6 +405,16 @@ var UploadTable = function (_a) {
             setDataSource(newDataSource);
         }
     }, [fileList, uploadUser]);
-    return (React.createElement(Table, { columns: columns, dataSource: dataSource, rowKey: "id", loading: loading }));
+    var myRowSelection = useMemo(function () {
+        return rowSelection === 'checkbox' || rowSelection === 'radio'
+            ? {
+                type: rowSelection,
+                onChange: function (selectedRowKeys, selectedRows) {
+                    setSelectedRows(selectedRows);
+                },
+            }
+            : rowSelection;
+    }, [rowSelection]);
+    return (React.createElement(Table, { columns: columns, dataSource: dataSource, rowKey: "id", loading: loading, rowSelection: myRowSelection }));
 };
 export default memo(UploadTable);

package/dist/components/Upload/upload.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { UploadProps } from 'antd/lib/upload';
 import { UploadFile } from './';
+import { TableRowSelection } from '../Table';
 export interface IUploadRef {
     validate?: (info?: any) => any;
 }
@@ -62,6 +63,10 @@ export interface IProps extends UploadProps {
     isDirect?: boolean;
     /**附件上传对象 */
     upload?: any;
+    /**是否显示selection */
+    rowSelection?: TableRowSelection<any> | 'checkbox' | 'radio';
+    /**组件提供给外部调用的一些方法 */
+    uploadTableRef?: any;
 }
 declare const Upload: React.FC<IProps>;
 export default Upload;

package/dist/components/Upload/upload.js

@@ -81,7 +81,7 @@ var _accept = [
 ];
 var statusArr = ['error', 'success', 'done', 'uploading', 'removed'];
 var Upload = function (props) {
-    var children = props.children, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.showUploadBtn, showUploadBtn = _b === void 0 ? true : _b, _c = props.showDeleteBtn, showDeleteBtn = _c === void 0 ? true : _c, onDownLoadCallbackBefore = props.onDownLoadCallbackBefore, _d = props.showDownloadBtn, showDownloadBtn = _d === void 0 ? true : _d, onDownLoadCallbackAfter = props.onDownLoadCallbackAfter, _e = props.showPreviewBtn, showPreviewBtn = _e === void 0 ? true : _e, onPreviewCallbackBefore = props.onPreviewCallbackBefore, _f = props.showTable, showTable = _f === void 0 ? true : _f, showUploadList = props.showUploadList, onChange = props.onChange, beforeUpload = props.beforeUpload, multiple = props.multiple, ztAccept = props.ztAccept, ztShowTipText = props.ztShowTipText, maxCount = props.maxCount, maxSize = props.maxSize, maxSizeStr = props.maxSizeStr, action = props.action, headers = props.headers, method = props.method, uploadUser = props.uploadUser, originFileList = props.originFileList, callback = props.callback, onDeleteCallback = props.onDeleteCallback, isAutoDelete = props.isAutoDelete, apiBaseUrl = props.apiBaseUrl, _g = props.fileBaseUrl, fileBaseUrl = _g === void 0 ? '' : _g, fileBtnText = props.fileBtnText, data = props.data, authToken = props.authToken, listType = props.listType, isPublic = props.isPublic, startColumns = props.startColumns, otherColumns = props.otherColumns, _h = props.isDirect, isDirect = _h === void 0 ? false : _h, upload = props.upload, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "ztShowTipText", "maxCount", "maxSize", "maxSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "startColumns", "otherColumns", "isDirect", "upload"]);
+    var children = props.children, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.showUploadBtn, showUploadBtn = _b === void 0 ? true : _b, _c = props.showDeleteBtn, showDeleteBtn = _c === void 0 ? true : _c, onDownLoadCallbackBefore = props.onDownLoadCallbackBefore, _d = props.showDownloadBtn, showDownloadBtn = _d === void 0 ? true : _d, onDownLoadCallbackAfter = props.onDownLoadCallbackAfter, _e = props.showPreviewBtn, showPreviewBtn = _e === void 0 ? true : _e, onPreviewCallbackBefore = props.onPreviewCallbackBefore, _f = props.showTable, showTable = _f === void 0 ? true : _f, showUploadList = props.showUploadList, onChange = props.onChange, beforeUpload = props.beforeUpload, multiple = props.multiple, ztAccept = props.ztAccept, ztShowTipText = props.ztShowTipText, maxCount = props.maxCount, maxSize = props.maxSize, maxSizeStr = props.maxSizeStr, action = props.action, headers = props.headers, method = props.method, uploadUser = props.uploadUser, originFileList = props.originFileList, callback = props.callback, onDeleteCallback = props.onDeleteCallback, isAutoDelete = props.isAutoDelete, apiBaseUrl = props.apiBaseUrl, _g = props.fileBaseUrl, fileBaseUrl = _g === void 0 ? '' : _g, fileBtnText = props.fileBtnText, data = props.data, authToken = props.authToken, listType = props.listType, isPublic = props.isPublic, startColumns = props.startColumns, otherColumns = props.otherColumns, _h = props.isDirect, isDirect = _h === void 0 ? false : _h, upload = props.upload, rowSelection = props.rowSelection, uploadTableRef = props.uploadTableRef, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "ztShowTipText", "maxCount", "maxSize", "maxSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "startColumns", "otherColumns", "isDirect", "upload", "rowSelection", "uploadTableRef"]);
     var _j = useState(originFileList || []), fileList = _j[0], setFileList = _j[1];
     var _k = useState('20M'), maxSizeTransStr = _k[0], setMaxSizeTransStr = _k[1];
     useEffect(function () {
@@ -305,6 +305,6 @@ var Upload = function (props) {
                     ? ztShowTipText
                     : 'PDF、Word、Excel、Txt、JPG、PNG、BMP、GIF、RAR、ZIP',
                 ")")))),
-        showTable && (React.createElement(UploadTable, { fileList: fileList, action: fileAction, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, headers: headers, method: method, uploadUser: uploadUser, onDelete: onDeleteHandle, onUpload: onUploadHandle, showDeleteBtn: showDeleteBtn, onDownLoadCallbackBefore: onDownLoadCallbackBefore, showDownloadBtn: showDownloadBtn, onDownLoadCallbackAfter: onDownLoadCallbackAfter, showPreviewBtn: showPreviewBtn, onPreviewCallbackBefore: onPreviewCallbackBefore, isAutoDelete: isAutoDelete, authToken: authToken, isPublic: isPublic, data: data, startColumns: startColumns, otherColumns: otherColumns, showUploadBtn: showUploadBtn }))));
+        showTable && (React.createElement(UploadTable, { fileList: fileList, action: fileAction, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, headers: headers, method: method, uploadUser: uploadUser, onDelete: onDeleteHandle, onUpload: onUploadHandle, showDeleteBtn: showDeleteBtn, onDownLoadCallbackBefore: onDownLoadCallbackBefore, showDownloadBtn: showDownloadBtn, onDownLoadCallbackAfter: onDownLoadCallbackAfter, showPreviewBtn: showPreviewBtn, onPreviewCallbackBefore: onPreviewCallbackBefore, isAutoDelete: isAutoDelete, authToken: authToken, isPublic: isPublic, data: data, startColumns: startColumns, otherColumns: otherColumns, showUploadBtn: showUploadBtn, rowSelection: rowSelection, uploadTableRef: uploadTableRef }))));
 };
 export default Upload;

package/dist/components/business/SearchContainer/hooks/useDynamic.d.ts

@@ -14,7 +14,7 @@ export declare function setDynamicKey(dynamicStorageKey: string, value: any): vo
 /**
  * @description 比对方法，获取最终数据
  */
-export declare function getSearchParams(storageKey: string, params: any, otherKeys: any): any;
+export declare function getSearchParams(storageKey: string, params: any, otherKeys?: any): any;
 declare function useDynamic(children: React.ReactNode, isDynamic?: boolean, // 是否利用动态列配置
 dynamicStorageKey?: string): {
     dynamicArr: ISearchLayout[];

package/dist/components/business/SearchContainer/hooks/useDynamic.js

@@ -45,14 +45,14 @@ export function getSearchParams(storageKey, params, otherKeys) {
             var _a = config[i] || {}, name_1 = _a.name, show = _a.show;
             // 如果这个key存在，那么不用处理
             if (show) {
-                break;
+                continue;
             }
             // 如果不展示当前key
             // 如果key在源数据中，直接删除
             if (resultParams.hasOwnProperty(name_1)) {
                 Reflect.deleteProperty(resultParams, name_1);
             }
-            else if (otherKeys.hasOwnProperty(name_1)) {
+            else if (otherKeys && otherKeys.hasOwnProperty(name_1)) {
                 // 如果key不在源数据中，找到该key对应的keys
                 var keys = otherKeys[name_1];
                 if (Array.isArray(keys)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "2.6.6",
+  "version": "2.6.9",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",