ztxkui 3.5.9 → 3.5.12

package/dist/TableDemo/ModalTable.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @author 陈亚雄
+ * @description 可编辑表格
+ */
+import React from 'react';
+declare const ModalTable: React.FC;
+export default ModalTable;

package/dist/TableDemo/ModalTable.js

@@ -0,0 +1,351 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
+var __generator = (this && this.__generator) || function (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 (_) 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 };
+    }
+};
+/**
+ * @author 陈亚雄
+ * @description 可编辑表格
+ */
+import React, { useState, useCallback, useRef, useEffect } from 'react';
+// redux
+// ztxkui公共组件
+import { Table, EnhanceSelect, Button, message, Modal } from '../index';
+// 路由配置
+// store
+// 自定义组件
+// 其他文件
+import update from 'immutability-helper';
+import { dataSource, list1 } from './data';
+var ModalTable = function () {
+    var _a = useState(dataSource), records = _a[0], setRecords = _a[1];
+    var recordsRef = useRef([]);
+    // 初始化渲染，针对配置了editable、editableConfig的列配置
+    var _b = useState(false), firstRender = _b[0], setFirstRender = _b[1];
+    // 新增删除行改变
+    var _c = useState(false), lengthChange = _c[0], setLengthChange = _c[1];
+    // 表格行拖拽改变
+    var _d = useState(false), moveChange = _d[0], setMoveChange = _d[1];
+    // 表格
+    var tableHandleRef = useRef({});
+    // 表格配置
+    var _e = useState({
+        test1: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
+        test2: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
+    }), tableConfig = _e[0], setTableConfig = _e[1];
+    var _f = useState(true), loading = _f[0], setLoading = _f[1];
+    var _g = useState(false), visible = _g[0], setVisible = _g[1];
+    useEffect(function () {
+        setTimeout(function () {
+            setLoading(false);
+        }, 5000);
+    }, []);
+    useEffect(function () {
+        setTimeout(function () {
+            setTableConfig({
+                test1: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
+                test2: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
+            });
+        }, 5000);
+    }, []);
+    var columns = [
+        {
+            title: '序号',
+            width: 62,
+            fixed: 'left',
+            key: 'index',
+            render: function (_text, _record, index) { return "" + (index + 1); },
+        },
+        {
+            title: '测试1',
+            width: 100,
+            dataIndex: 'test1',
+            key: 'test1',
+            editable: true,
+            validate: {},
+            shouldCellUpdate: function (record, preRecord) {
+                if (firstRender) {
+                    setFirstRender(false);
+                    return true;
+                }
+                if (lengthChange) {
+                    setLengthChange(false);
+                    return true;
+                }
+                if (moveChange) {
+                    setMoveChange(false);
+                    return true;
+                }
+                return record.test1 !== preRecord.test1;
+            },
+        },
+        {
+            title: '测试2',
+            width: 100,
+            dataIndex: 'test2',
+            key: 'test2',
+            editable: true,
+            editableConfig: {
+                type: 'inputNumber',
+            },
+            validate: {
+                validate: function (value, record, index, title) {
+                    if (value === 102) {
+                        return Promise.reject({
+                            errorFields: [
+                                {
+                                    errors: "\u6D4B\u8BD5-\u660E\u7EC6\u8868 \u7B2C" + index + "\u884C \u6D4B\u8BD52 \u4E0D\u80FD\u5C0F\u4E8E102\uFF01",
+                                },
+                            ],
+                        });
+                    }
+                    return Promise.resolve();
+                },
+            },
+            shouldCellUpdate: function (record, preRecord) {
+                if (firstRender) {
+                    setFirstRender(false);
+                    return true;
+                }
+                if (lengthChange) {
+                    setLengthChange(false);
+                    return true;
+                }
+                if (moveChange) {
+                    setMoveChange(false);
+                    return true;
+                }
+                return record.test2 !== preRecord.test2;
+            },
+        },
+        {
+            title: '测试3',
+            width: 100,
+            dataIndex: 'test3',
+            key: 'test3',
+            shouldCellUpdate: function (record, preRecord) {
+                if (lengthChange) {
+                    setLengthChange(false);
+                    return true;
+                }
+                if (moveChange) {
+                    setMoveChange(false);
+                    return true;
+                }
+                return record.test3 !== preRecord.test3;
+            },
+            validate: {},
+            render: function (text, record, index) {
+                return (React.createElement(EnhanceSelect, { value: text, list: list1, dataKey: "id", titleKey: "name", dropdownMatchSelectWidth: 130, onChange: function (value, option, fullData) {
+                        tableHandleRef.current.clearErrorClass(index);
+                        var newRecord = {
+                            test3: value,
+                            test3Name: fullData === null || fullData === void 0 ? void 0 : fullData.name,
+                        };
+                        onEditableSaveHandle(newRecord, index);
+                    } }));
+            },
+        },
+        {
+            title: '测试4',
+            width: 100,
+            dataIndex: 'test4',
+            key: 'test4',
+        },
+        {
+            title: '测试5',
+            width: 100,
+            dataIndex: 'test5',
+            key: 'test5',
+        },
+        {
+            title: '测试6',
+            width: 100,
+            dataIndex: 'test6',
+            key: 'test6',
+        },
+        {
+            title: '测试7',
+            width: 100,
+            dataIndex: 'test7',
+            key: 'test7',
+        },
+        {
+            title: '测试8',
+            width: 100,
+            dataIndex: 'test8',
+            key: 'test8',
+        },
+        {
+            title: '测试9',
+            width: 100,
+            dataIndex: 'test9',
+            key: 'test9',
+        },
+        {
+            title: '测试10',
+            width: 100,
+            dataIndex: 'test10',
+            key: 'test10',
+        },
+    ];
+    // 初始化渲染，针对配置了editable、editableConfig的列配置
+    useEffect(function () {
+        setFirstRender(true);
+    }, []);
+    // 将表格最新数据赋值给ref引用
+    useEffect(function () {
+        recordsRef.current = records;
+    }, [records]);
+    // 表格数据改变相关
+    var onEditableSaveHandle = useCallback(function (record, index, _dataIndex) {
+        var _a;
+        if (_dataIndex === void 0) { _dataIndex = ''; }
+        if (typeof index === 'number') {
+            var newRecords = recordsRef.current.slice();
+            var item = newRecords[index];
+            newRecords.splice(index, 1, _dataIndex
+                ? __assign(__assign(__assign({}, record), item), (_a = {}, _a[_dataIndex] = record[_dataIndex], _a)) : __assign(__assign({}, item), record));
+            setRecords(newRecords);
+        }
+    }, [setRecords]);
+    // 新增删除行
+    var onAddAndDelHandle = useCallback(function (type, index) {
+        var newRecords = recordsRef.current.slice();
+        if (type === 'add') {
+            var newItem = __assign(__assign({}, newRecords[index]), { _isNewData: true, id: Date.now() + "-" + index });
+            newRecords.splice(index + 1, 0, newItem);
+            setRecords(newRecords);
+            setLengthChange(true);
+        }
+        else if (type === 'del') {
+            if (newRecords.length === 1) {
+                newRecords.splice(index, 1, {
+                    _isNewData: true,
+                    id: Date.now() + "-" + index,
+                });
+            }
+            else {
+                newRecords.splice(index, 1);
+            }
+            setRecords(newRecords);
+            setLengthChange(true);
+        }
+    }, [setRecords]);
+    // 表格拖拽排序功能函数
+    var onMoveRowHandle = useCallback(function (dragIndex, hoverIndex) {
+        var newRecords = recordsRef.current.slice();
+        var dragRow = newRecords[dragIndex];
+        var newDataSource = update(newRecords, {
+            $splice: [
+                [dragIndex, 1],
+                [hoverIndex, 0, dragRow],
+            ],
+        });
+        setRecords(newDataSource);
+        setMoveChange(true);
+    }, [setRecords]);
+    return (React.createElement("div", null,
+        React.createElement("div", null,
+            "\u53EF\u7F16\u8F91\u8868\u683C\uFF1B\u5982\u679C\u662F\u8F93\u5165\u6846\uFF0C\u53EF\u4F7F\u7528\u8868\u683C\u9ED8\u8BA4\u63D0\u4F9B\u7684\u7F16\u8F91\u6846\uFF1B \u914D\u7F6Eeditable\u4E3Atrue\u5373\u53EF\uFF0C\u8FD8\u53EF\u914D\u7F6EeditableConfig\u914D\u7F6E\u6267\u884C\u7C7B\u578B\u7B49\uFF1B\u5177\u4F53editableConfig\u53EF\u67E5\u770B\u8BE6\u7EC6\u7B7E\u540D",
+            React.createElement("br", null),
+            React.createElement("b", null, "\u5BF9\u4E8E\u914D\u7F6E\u4E86\u7F16\u8F91\u7684\u8868\u683C\uFF0C\u4E00\u5B9A\u8981\u4F7F\u7528SCU\u6765\u4F18\u5316\u8868\u683C\u6E32\u67D3\uFF0C\u6B64\u4E3E\u53EF\u4EE5\u4F18\u5316\u8868\u683C\u6E32\u67D3"),
+            React.createElement("br", null),
+            React.createElement("b", null, "\u5982\u679C\u914D\u7F6E\u4E86editable\uFF0C\u5E76\u4E14\u914D\u7F6E\u4E86SCU\u6765\u4F18\u5316\u6E32\u67D3\uFF0C\u90A3\u4E48\u521D\u59CB\u5316\u7684\u65F6\u5019\u9700\u8981\u7528\u4E00\u4E2A\u53D8\u91CF\u6807\u8BC6\u9996\u6B21\u9700\u8981\u6E32\u67D3"),
+            React.createElement("br", null),
+            React.createElement("b", null, "\u65B0\u589E\u5220\u9664\u884C\uFF0C\u8868\u683C\u62D6\u62FD\u6392\u5E8F\uFF1B"),
+            "\u5BF9\u4E8E\u914D\u7F6E\u4E86SCU\u7684\u5217\uFF0C\u9700\u8981\u5728\u65B0\u589E\u5220\u9664\u7684\u65F6\u5019\u91CD\u65B0\u6E32\u67D3\uFF0C\u901A\u8FC7\u8BBE\u7F6Estate\u6807\u8BC6",
+            React.createElement("br", null),
+            React.createElement("b", null, "\u8868\u683C\u81EA\u5B9A\u4E49\u9A8C\u8BC1\uFF0C\u4F20\u5165tableHandleRef\u4E00\u4E2ARef\u5BF9\u8C61\uFF0C\u53EF\u83B7\u53D6\u8868\u683C\u63D0\u4F9B\u76F8\u5173\u65B9\u6CD5"),
+            React.createElement("p", null, "1.\u7F16\u5199\u9A8C\u8BC1\u89C4\u5219\uFF0C\u5728\u5217\u91CC\u9762\u7F16\u5199\uFF0C\u901A\u8FC7\u4F20\u5165validate\u5C5E\u6027\u914D\u7F6E,\u5177\u4F53\u53EF\u67E5\u770B\u7B7E\u540D \u5982\u679C\u53EA\u662F\u7B80\u5355\u7684\u975E\u7A7A\u9A8C\u8BC1\uFF0C\u90A3\u4E48\u53EF\u4F20\u5165\u4E00\u4E2A\u7A7A\u5BF9\u8C61\u5373\u53EF \u5982\u679C\u662F\u590D\u6742\u9A8C\u8BC1\u53EF\u901A\u8FC7validate\u4F20\u5165\u66F4\u591A\u914D\u7F6E"),
+            React.createElement("p", null, "2.\u5982\u679C\u4F20\u5165\u4E86\u81EA\u5B9A\u4E49render\u51FD\u6570\uFF0C\u7EC4\u4EF6\u65E0\u6CD5\u638C\u63E1\u5728\u4F55\u65F6\u6E05\u7A7A\u9519\u8BEF\u4FE1\u606F\uFF0C\u6240\u4EE5\u9700\u8981\u8C03\u7528\u65B9\u4E3B\u52A8\u6E05\u7A7A\u9519\u8BEF\u4FE1\u606F")),
+        React.createElement(Button, { onClick: function () {
+                (function () {
+                    var _a;
+                    return __awaiter(this, void 0, void 0, function () {
+                        var err_1, errorFields;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0:
+                                    _b.trys.push([0, 2, , 3]);
+                                    return [4 /*yield*/, ((_a = tableHandleRef.current) === null || _a === void 0 ? void 0 : _a.validate())];
+                                case 1:
+                                    _b.sent();
+                                    return [3 /*break*/, 3];
+                                case 2:
+                                    err_1 = _b.sent();
+                                    console.log(err_1);
+                                    errorFields = err_1.errorFields;
+                                    if (errorFields) {
+                                        message.warning(errorFields[0].errors + '');
+                                    }
+                                    return [3 /*break*/, 3];
+                                case 3: return [2 /*return*/];
+                            }
+                        });
+                    });
+                })();
+            } }, "\u9A8C\u8BC1"),
+        React.createElement(Button, { onClick: function () {
+                setVisible(function (visible) { return !visible; });
+                setLoading(true);
+                setTimeout(function () {
+                    setLoading(false);
+                }, 5000);
+            } }, "\u6253\u5F00\u6A21\u6001\u6846"),
+        React.createElement(Modal, { title: "\u6D4B\u8BD5", loading: loading, visible: visible, onCancel: function () { return setVisible(false); } },
+            React.createElement(Table, { dataSource: records, columns: columns, rowKey: "id", 
+                // 表格项可输入
+                onEditableSave: onEditableSaveHandle, 
+                // 新增删除行
+                onAddAndDelHandle: onAddAndDelHandle, 
+                // 表格行拖拽
+                onMoveRow: onMoveRowHandle, 
+                // tableValidate
+                tableHandleRef: tableHandleRef, tableName: "\u6211\u662F\u4E00\u4E2A\u8868\u683C", 
+                // 显隐配置
+                configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011" }))));
+};
+export default ModalTable;

package/dist/TableDemo/index.js

@@ -10,10 +10,12 @@ import React from 'react';
 // 自定义组件
 import BasicTable from './BasicTable';
 import EditableTable from './EditableTable';
+import ModalTable from './ModalTable';
 // 其他文件
 var TableDemo = function () {
     return (React.createElement("div", null,
         React.createElement(BasicTable, null),
-        React.createElement(EditableTable, null)));
+        React.createElement(EditableTable, null),
+        React.createElement(ModalTable, null)));
 };
 export default TableDemo;

package/dist/UploadDemo.js

@@ -39,7 +39,7 @@ import Upload from 'components/Upload';
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { UploadSingle } from './index';
 var originFileList = [];
-var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MDk4OTYwNCwib3JnX25hbWUiOm51bGwsImp0aSI6IjUwYWNmZDUzLWQwODMtNDdjYy05YWY5LWUzMWQxYTk1NDBmZiIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.eIZkNEbrItNuZ9YXo3tNhwnenZVOyVGXWh2Z5rOWC74";
+var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MTI0MDUxNiwib3JnX25hbWUiOm51bGwsImp0aSI6IjEwOGY2YjhmLTU0ZjUtNDcwYy04YzU0LTU4MWViZDMyMmZjYSIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.UXl68JBAGWQgL9uweedOonIj7Sflz2B_PQ6JS-Mi6_E";
 function UploadDemo() {
     var _this = this;
     var _a = useState(originFileList), fileList = _a[0], setFileList = _a[1];
@@ -77,6 +77,11 @@ function UploadDemo() {
                     // percent: 100,
                     // status: 'error',
                 },
+                {
+                    attachId: '1559718559965757442',
+                    attachName: '浙商中拓报总第101期.pdf',
+                    fileSize: 301024,
+                },
                 // {
                 //   // uid可不传，这个应该时组件需要一个内部id，可以同attachId
                 //   uid: '1418469936545132546',

package/dist/components/Table/table-dynamic.js

@@ -75,6 +75,7 @@ function TableDynamic(props) {
     var onDynamicChangeHandle = function (checkedValue) {
         setCheckedValues(checkedValue);
     };
+    console.log(visible);
     return (React.createElement(Drawer, { placement: "right", getContainer: false, closable: false, maskClosable: false, 
         // style={{ position: 'absolute' }}
         visible: visible, className: "zt-table__dynamic", title: React.createElement("div", null,

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

@@ -218,6 +218,7 @@ var UploadTable = function (_a) {
                                 var newDataSource = ((_b = (_a = (dataSourceRef.current || [])) === null || _a === void 0 ? void 0 : _a.slice) === null || _b === void 0 ? void 0 : _b.call(_a)) || [];
                                 if ((_c = newDataSource[index]) === null || _c === void 0 ? void 0 : _c.loading) {
                                     newDataSource.splice(index, 1, __assign(__assign({}, record), { loading: false }));
+                                    message.warning((record === null || record === void 0 ? void 0 : record.fileName) + " \u6587\u4EF6\u4E0B\u8F7D\u5931\u8D25!");
                                     setDataSource(newDataSource);
                                 }
                             },
@@ -247,6 +248,7 @@ var UploadTable = function (_a) {
                                 var newDataSource = ((_b = (_a = (dataSourceRef.current || [])) === null || _a === void 0 ? void 0 : _a.slice) === null || _b === void 0 ? void 0 : _b.call(_a)) || [];
                                 if ((_c = newDataSource[index]) === null || _c === void 0 ? void 0 : _c.loading) {
                                     newDataSource.splice(index, 1, __assign(__assign({}, record), { loading: false }));
+                                    message.warning((record === null || record === void 0 ? void 0 : record.fileName) + " \u6587\u4EF6\u4E0B\u8F7D\u5931\u8D25!");
                                     setDataSource(newDataSource);
                                 }
                             },

package/dist/components/business/Signatures/index.js

@@ -64,7 +64,7 @@ var FLOW_IDS = [
  */
 var Sinatures = function (_a) {
     var isUpload = _a.isUpload, qunjSealChange = _a.qunjSealChange, electronicSealChange = _a.electronicSealChange, onSigValuesChange = _a.onSigValuesChange, handleRef = _a.handleRef, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, systemCode = _a.systemCode, token = _a.token, openCustomerModalHandle = _a.openCustomerModalHandle, request = _a.request, otherParams = __rest(_a, ["isUpload", "qunjSealChange", "electronicSealChange", "onSigValuesChange", "handleRef", "ZT_API_BASEURL", "ZT_FILE_BASEURL", "systemCode", "token", "openCustomerModalHandle", "request"]);
-    var canEdit = otherParams.canEdit, needQj = otherParams.needQj, needDg = otherParams.needDg, needQys = otherParams.needQys, fileList = otherParams.fileList, qunjSeal = otherParams.qunjSeal, electronicSeal = otherParams.electronicSealIdList, flowId = otherParams.flowId, deptId = otherParams.deptId, flowStatus = otherParams.flowStatus, caseId = otherParams.caseId, contract_id = otherParams.contractId, docAttachMap = otherParams.docAttachMap, checkAttachIdList = otherParams.checkAttachIdList, // 已盖章附件id
+    var canEdit = otherParams.canEdit, needQj = otherParams.needQj, needDg = otherParams.needDg, needQys = otherParams.needQys, fileList = otherParams.fileList, qunjSeal = otherParams.qunjSeal, electronicSeal = otherParams.electronicSealIdList, flowId = otherParams.flowId, deptId = otherParams.deptId, flowStatus = otherParams.flowStatus, caseId = otherParams.caseId, contractId = otherParams.contractId, docAttachMap = otherParams.docAttachMap, checkAttachIdList = otherParams.checkAttachIdList, // 已盖章附件id
     documentIdList = otherParams.documentIdList;
     var authToken = token || '';
     // 是否可编辑 1可编辑  0不可编辑
@@ -80,31 +80,31 @@ var Sinatures = function (_a) {
     // 设置确认盖章按钮是否展示
     var _e = useState(false), checkSealVisible = _e[0], setCheckSealVisible = _e[1];
     // 合同id
-    var _f = useState(contract_id), contractId = _f[0], setContractId = _f[1];
+    var contract_id = contractId;
     // 已盖章附件id
-    var _g = useState(checkAttachIdList || []), sealedIds = _g[0], setSealedIds = _g[1];
+    var _f = useState(checkAttachIdList || []), sealedIds = _f[0], setSealedIds = _f[1];
     // docAttachMap
-    var _h = useState(docAttachMap), attachMap = _h[0], setAttachMap = _h[1];
+    var _g = useState(docAttachMap), attachMap = _g[0], setAttachMap = _g[1];
     // 文档id列表
-    var _j = useState(documentIdList), documentIds = _j[0], setDocumentIds = _j[1];
+    var _h = useState(documentIdList), documentIds = _h[0], setDocumentIds = _h[1];
     // 总用印次数超过4倍
-    var _k = useState(false), isTotalSealNumTooMore = _k[0], setIsTotalSealNumTooMore = _k[1];
+    var _j = useState(false), isTotalSealNumTooMore = _j[0], setIsTotalSealNumTooMore = _j[1];
     // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
     var showContranctNum = FLOW_IDS.includes("" + flowId);
     // 电子印章列表
-    var _l = useState([]), electronicList = _l[0], setElectronicList = _l[1];
+    var _k = useState([]), electronicList = _k[0], setElectronicList = _k[1];
     // 群杰印章列表
-    var _m = useState([]), sealList = _m[0], setSealList = _m[1];
+    var _l = useState([]), sealList = _l[0], setSealList = _l[1];
     // 上一次盖章时的参数信息
-    var _o = useState({}), prevParam = _o[0], setPrevParam = _o[1];
+    var _m = useState({}), prevParam = _m[0], setPrevParam = _m[1];
     // 请确认
-    var _p = useState(false), isSure = _p[0], setIsSure = _p[1];
+    var _o = useState(false), isSure = _o[0], setIsSure = _o[1];
     // 群杰表单
     var form = Form.useForm()[0];
     // 是否加盖群杰印章
-    var _q = useState(true), checked = _q[0], setChecked = _q[1];
+    var _p = useState(true), checked = _p[0], setChecked = _p[1];
     // 盖章按钮loading
-    var _r = useState(false), loading = _r[0], setLoading = _r[1];
+    var _q = useState(false), loading = _q[0], setLoading = _q[1];
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
         var _value = __assign(__assign({ isTakeOut: 0 }, (showContranctNum ? { contranctNum: 1 } : {})), { details: [] });
@@ -233,14 +233,14 @@ var Sinatures = function (_a) {
             deleteAttachIdList: [],
             docAttachMap: attachMap,
         };
-        if (!(contractId || contract_id)) {
+        if (!contract_id) {
             setDocumentIds([]);
             setSealedIds([]);
             params.attachIdList = checkedElecSealIds;
             params.deleteAttachIdList = [];
         }
         else {
-            params.contractId = contractId || contract_id;
+            params.contractId = contract_id;
         }
         checkedElecSealIds.forEach(function (n) {
             if (sealedIds.length !== 0 && !sealedIds.includes(n)) {
@@ -271,8 +271,8 @@ var Sinatures = function (_a) {
                         sealedIdsCopy.splice(i, 1);
                     }
                 }
+                contract_id = res.data.data.contractId;
                 setSealedIds(__spreadArray(__spreadArray([], sealedIdsCopy), res.data.data.attachIdList));
-                setContractId(res.data.data.contractId);
                 setAttachMap(res.data.data.docAttachMap);
                 setDocumentIds(res.data.data.documentIdList);
                 window.open(res.data.data.preSignUrl);
@@ -289,10 +289,10 @@ var Sinatures = function (_a) {
     };
     /** 查看盖章页面 */
     var viewSealPageFn = function () {
-        if (contractId || contract_id) {
+        if (contract_id) {
             request({
                 url: '/api/zmdms-resource/seal/view-seal-state',
-                data: { contractId: contractId || contract_id, canEdit: canEdit, flowStatus: flowStatus },
+                data: { contractId: contract_id, canEdit: canEdit, flowStatus: flowStatus },
                 method: 'POST',
             })
                 .then(function (res) {
@@ -447,7 +447,7 @@ var Sinatures = function (_a) {
                                 React.createElement(Button, { type: "link", style: __assign({}, (checkSealVisible && isEdit
                                         ? {}
                                         : { display: 'none' })), size: "small", loading: loading, onClick: checkSealFn }, "\u6307\u5B9A\u7B7E\u7F72\u4F4D\u7F6E"),
-                                React.createElement(Button, { type: "link", style: __assign({}, (contractId || contract_id ? {} : { display: 'none' })), size: "small", onClick: viewSealPageFn }, "\u9884\u89C8\u76D6\u7AE0\u6548\u679C"))) : (React.createElement(React.Fragment, null));
+                                React.createElement(Button, { type: "link", style: __assign({}, (contract_id ? {} : { display: 'none' })), size: "small", onClick: viewSealPageFn }, "\u9884\u89C8\u76D6\u7AE0\u6548\u679C"))) : (React.createElement(React.Fragment, null));
                         };
                         var obj = {
                             children: React.createElement(Comp, null),
@@ -499,7 +499,7 @@ var Sinatures = function (_a) {
         columnsLast = columnsLast.filter(function (item) { return !['isWatermark', 'needQys'].includes(item.key); });
     }
     // 上传组件的数据
-    var _s = useState(), originFileList = _s[0], setOriginFileList = _s[1];
+    var _r = useState(), originFileList = _r[0], setOriginFileList = _r[1];
     /** 签章组件onChange事件 */
     var sigValuesChange = function (type, value) {
         var _a, _b;
@@ -516,8 +516,8 @@ var Sinatures = function (_a) {
             setCheckSealVisible(value ? true : hasElecSeal.length > 1 ? true : false);
             // 去除加盖电子印章勾选时  清除合同id 等之前的信息
             if (!value && hasElecSeal.length === 1) {
+                contract_id = '';
                 setSealedIds([]);
-                setContractId('');
                 setAttachMap(null);
                 setDocumentIds([]);
                 setElectronicSeal([]);
@@ -593,7 +593,7 @@ var Sinatures = function (_a) {
                 checkAttachIdList: sealedIds,
                 docAttachMap: attachMap,
                 documentIdList: documentIds,
-                contractId: contractId || contract_id,
+                contractId: contract_id,
                 isTotalSealNumTooMore: isTotalSealNumTooMore,
             };
         },
@@ -644,10 +644,7 @@ var Sinatures = function (_a) {
                 return false;
             }
             // 没有确认盖章
-            if (isEdit &&
-                needQys &&
-                hasElectronicSeal &&
-                !(contractId || contract_id)) {
+            if (isEdit && needQys && hasElectronicSeal && !contract_id) {
                 message.warning('请点击确认盖章按钮，确认盖章位置后方可提交！');
                 return false;
             }

package/package.json

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