ztxkui 2.1.7 → 2.2.1

package/dist/components/EnhanceSelect/index.js

@@ -276,7 +276,7 @@ function EnhanceSelect(_a) {
         }
         else {
             if (typeof restProps.value === 'string' ||
-                Array.isArray(restProps.value)) {
+                (Array.isArray(restProps.value) && restProps.value.length > 0)) {
                 // console.log('第二次请求数据，默认为需要根据主键去请求', restProps.value);
                 setFirstLoading(true);
                 getRemoteDataHandle('', restProps.value);
@@ -344,6 +344,7 @@ function EnhanceSelect(_a) {
     };
     // onChange 方法
     var onChangeHandle = function (value, option) {
+        setFirstLoading(true);
         if (((Array.isArray(value) && value.length === 0) || !value) &&
             remoteSearch &&
             !firstClearData) {

package/dist/components/Table/table.js

@@ -118,9 +118,10 @@ function Table(props) {
      * @description 动态列配置重置功能
      */
     var resetDynamicHandle = useCallback(function () {
-        setColumns(initColumns);
+        var _initColumns = initColumns || columns;
+        setColumns(_initColumns);
         onDynamicChange &&
-            onDynamicChange((initColumns || []).map(function (item) {
+            onDynamicChange((_initColumns || []).map(function (item) {
                 if (item.dataIndex || item.key) {
                     return {
                         dataIndex: item.dataIndex,
@@ -131,7 +132,7 @@ function Table(props) {
                 return __assign({}, item);
             }));
         hideDynamicHandle();
-    }, [initColumns, hideDynamicHandle, onDynamicChange]);
+    }, [initColumns, columns, hideDynamicHandle, onDynamicChange]);
     /**
      * @description 切换行位置
      */

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

@@ -23,6 +23,7 @@ interface IProps {
     authToken?: string;
     isPublic?: boolean;
     /**额外的上传表格列配置 */
+    startColumns?: any;
     otherColumns?: any;
     showUploadBtn?: boolean;
 }

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

@@ -58,11 +58,11 @@ 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.otherColumns, otherColumns = _c === void 0 ? [] : _c, showUploadBtn = _a.showUploadBtn;
-    var _d = useState([]), dataSource = _d[0], setDataSource = _d[1];
-    var _e = useState(false), loading = _e[0], setLoading = _e[1];
+    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 _e = useState([]), dataSource = _e[0], setDataSource = _e[1];
+    var _f = useState(false), loading = _f[0], setLoading = _f[1];
     var columns = showUploadBtn
-        ? __spreadArray(__spreadArray([
+        ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], startColumns), [
             {
                 title: '文件名称',
                 width: 200,
@@ -91,7 +91,7 @@ var UploadTable = function (_a) {
                 dataIndex: 'uploadUser',
                 key: 'uploadUser',
             }
-        ], otherColumns), [
+        ]), otherColumns), [
             {
                 title: '上传进度',
                 width: 200,
@@ -153,7 +153,7 @@ var UploadTable = function (_a) {
                                 }, type: "link" }, "\u5220\u9664")))));
                 },
             },
-        ]) : __spreadArray(__spreadArray([
+        ]) : __spreadArray(__spreadArray(__spreadArray(__spreadArray([], startColumns), [
         {
             title: '文件名称',
             width: 200,
@@ -182,7 +182,7 @@ var UploadTable = function (_a) {
             dataIndex: 'uploadUser',
             key: 'uploadUser',
         }
-    ], otherColumns), [
+    ]), otherColumns), [
         {
             title: '操作',
             width: 80,

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

@@ -51,6 +51,7 @@ export interface IProps extends UploadProps {
     /**是否是公用文件 */
     isPublic?: boolean;
     /**额外的上传表格列配置 */
+    startColumns?: any;
     otherColumns?: any;
     /**是否直接替换 */
     isDirect?: boolean;

package/dist/components/Upload/upload.js

@@ -44,7 +44,7 @@ var _accept = [
     '.gif',
 ];
 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, 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, otherColumns = props.otherColumns, _h = props.isDirect, isDirect = _h === void 0 ? false : _h, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "maxCount", "maxSize", "maxSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "otherColumns", "isDirect"]);
+    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, 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, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "maxCount", "maxSize", "maxSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "startColumns", "otherColumns", "isDirect"]);
     var _j = useState(originFileList || []), fileList = _j[0], setFileList = _j[1];
     var _k = useState('20M'), maxSizeTransStr = _k[0], setMaxSizeTransStr = _k[1];
     useEffect(function () {
@@ -184,6 +184,6 @@ var Upload = function (props) {
                 "(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301",
                 maxSizeTransStr,
                 "\uFF0C\u652F\u6301\u683C\u5F0F\uFF1APDF\u3001Word\u3001Excel\u3001Txt\u3001JPG\u3001PNG\u3001BMP\u3001GIF\u3001RAR\u3001ZIP)")))),
-        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, 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 }))));
 };
 export default Upload;

package/package.json

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