ztxkui 3.5.3 → 3.5.6

package/dist/UploadDemo.js

@@ -39,10 +39,11 @@ import Upload from 'components/Upload';
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { UploadSingle } from './index';
 var originFileList = [];
-var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoid2YxMCIsImVtcF9uYW1lIjoi5rWB56iL5Lit5b-DMTAiLCJlbXBfbnVtYmVyIjoiWUcyMjAzMDUwIiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLmtYHnqIvkuK3lv4MxMCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNTQyMDc2MzA4NTc4MDI1NDc0IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDgwODI5MDYzNTY0NTQxOTU0IiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjpudWxsLCJleHAiOjE2NjA4MjM2OTUsIm9yZ19uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui6IKh5Lu95pyJ6ZmQ5YWs5Y-4IiwianRpIjoiYzEyZTUxOTctZTg1OS00ZTYzLWJhNDQtYjVkOTQ2NzBlMjYzIiwibWVtYmVyX2lkIjoxNTA5NTA5ODExODI5OTUyNTEzLCJjb21wYW55X2lkIjoxNDE1ODM3OTkxNzAxMDM3MDU3LCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE1MDk1MTAyMzAzNjY5MjQ4MDIiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTUyMDEsIm5pY2tfbmFtZSI6Iua1geeoi-S4reW_gzEwIiwiY29tcGFueV9uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui6IKh5Lu95pyJ6ZmQ5YWs5Y-4IiwiZGVwdF9pZCI6IjE0MzI5NTYyMDI2NzQxODgyODkiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6IndmMTAiLCJyZXN1bWVfaWQiOm51bGx9.mz7PP0RGshNbc6ynDibJASDvw1q1tmHn1rCBWQ2khEI";
+var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MDk4OTYwNCwib3JnX25hbWUiOm51bGwsImp0aSI6IjUwYWNmZDUzLWQwODMtNDdjYy05YWY5LWUzMWQxYTk1NDBmZiIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.eIZkNEbrItNuZ9YXo3tNhwnenZVOyVGXWh2Z5rOWC74";
 function UploadDemo() {
     var _this = this;
     var _a = useState(originFileList), fileList = _a[0], setFileList = _a[1];
+    var _b = useState([]), fileList1 = _b[0], setFileList1 = _b[1];
     var upload = useRef();
     var uploadTableRef = useRef();
     useEffect(function () {
@@ -139,6 +140,7 @@ function UploadDemo() {
             });
             console.log(successFileList);
             setFileList(filelist);
+            setFileList1(filelist);
         }
     }, []);
     var checkHandle = function () { return __awaiter(_this, void 0, void 0, function () {
@@ -208,7 +210,9 @@ function UploadDemo() {
                 showPreviewIcon: true,
                 showDownloadIcon: true,
                 showRemoveIcon: true,
-            }, 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) {
+            }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList1, maxCount: 1, callback: uploadCallbackFn, onChange: function () {
+                console.log(1111);
+            }, onDeleteCallback: function (index, file) {
                 console.log(index, file);
             }, authToken: token }),
         React.createElement("button", { onClick: checkHandle }, "\u68C0\u67E5"),

package/dist/components/business/Signatures/components/QunjSeal.d.ts

@@ -12,6 +12,7 @@ interface IProps {
     handleRef?: any;
     checked: boolean;
     form: any;
+    setQunjSeal: any;
 }
 declare const QunjSeal: React.FC<IProps>;
 export default QunjSeal;

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

@@ -23,12 +23,14 @@ import { Form, InputNumber, SearchContainer, Radio } from '../../../../index';
 import { SealCheckboxGroup } from './SealCheckbox';
 var Item = SearchContainer.SearchItem;
 var QunjSeal = function (_a) {
-    var value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, handleRef = _a.handleRef, checked = _a.checked, form = _a.form;
+    var value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, handleRef = _a.handleRef, checked = _a.checked, form = _a.form, setQunjSeal = _a.setQunjSeal;
     useEffect(function () {
         if (value) {
-            form.setFieldsValue(__assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum ? {} : { contranctNum: 1 })));
+            var _value = __assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum ? {} : { contranctNum: 1 }));
+            form.setFieldsValue(_value);
+            setQunjSeal(_value);
         }
-    }, [value, form]);
+    }, [value, form, setQunjSeal]);
     var onSealCheckboxHandle = function (values) {
         form.setFieldsValue({
             values: values,
@@ -45,7 +47,7 @@ var QunjSeal = function (_a) {
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
-            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit })));
+            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, showContranctNum: showContranctNum })));
     };
     return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle }, checked ? (React.createElement(React.Fragment, null,
         React.createElement("div", { style: {

package/dist/components/business/Signatures/components/SealCheckbox.d.ts

@@ -22,6 +22,7 @@ interface ISealProps {
     }[];
     handleRef?: any;
     isEdit: boolean;
+    showContranctNum: boolean;
 }
 declare const SealCheckboxGroup: React.FC<ISealProps>;
 export { SealCheckboxGroup };

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

@@ -66,7 +66,7 @@ var SealCheckbox = function (_a) {
             React.createElement("div", { style: { marginLeft: '50px' } }, "\u6B21"))));
 };
 var SealCheckboxGroup = function (_a) {
-    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit;
+    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum;
     var onChangeHandle = function (_value, index, sealNo, type) {
         var _a, _b, _c, _d;
         var contractNum = (_b = (_a = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _a === void 0 ? void 0 : _a.getData().qunjSeal) === null || _b === void 0 ? void 0 : _b.contranctNum;
@@ -90,7 +90,7 @@ var SealCheckboxGroup = function (_a) {
         }
         var totalSealNum = sumBy(valueArr, 'sealCount');
         onChange && onChange(valueArr);
-        if (typeof contractNum === 'number') {
+        if (typeof contractNum === 'number' && showContranctNum) {
             if (totalSealNum > contractNum * 4) {
                 (_c = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _c === void 0 ? void 0 : _c.getData('4');
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');

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

@@ -224,7 +224,6 @@ var Sinatures = function (_a) {
     };
     /** 指定签署位置 */
     var checkSealFn = function () {
-        setLoading(true);
         // 已勾选的要加盖电子印章的附件id列表
         var checkedElecSealIds = records
             .filter(function (item) { return item.isElectronicSeal; })
@@ -233,6 +232,7 @@ var Sinatures = function (_a) {
             message.info('请勾选电子印章！');
             return;
         }
+        setLoading(true);
         var params = {
             attachIdList: [],
             sealIdList: innerElectronicSeal,
@@ -440,10 +440,15 @@ var Sinatures = function (_a) {
                     title: '电子印章设置',
                     key: 'setElectronicSeal',
                     dataIndex: 'setElectronicSeal',
-                    width: 135,
+                    width: 150,
                     render: function (value, row, index) {
                         var Comp = function () {
-                            return records.length !== 0 ? (React.createElement("div", { style: { height: '100%', paddingTop: '23px' } },
+                            return records.length !== 0 ? (React.createElement("div", { style: {
+                                    height: '100%',
+                                    paddingTop: '23px',
+                                    display: 'flex',
+                                    flexDirection: 'column',
+                                } },
                                 React.createElement(Button, { type: "link", style: __assign({}, (checkSealVisible && isEdit
                                         ? {}
                                         : { display: 'none' })), size: "small", loading: loading, onClick: checkSealFn }, "\u6307\u5B9A\u7B7E\u7F72\u4F4D\u7F6E"),
@@ -474,7 +479,7 @@ var Sinatures = function (_a) {
                     width: 620,
                     render: function (value, row, index) {
                         var obj = {
-                            children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, isEdit: isEdit, handleRef: handleRef, showContranctNum: showContranctNum, sealList: sealList, checked: checked, form: form })),
+                            children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, isEdit: isEdit, handleRef: handleRef, showContranctNum: showContranctNum, sealList: sealList, checked: checked, form: form, setQunjSeal: setQunjSeal })),
                             props: {},
                         };
                         obj.props['rowSpan'] = index === 0 ? records.length : 0;
@@ -639,7 +644,7 @@ var Sinatures = function (_a) {
                 return false;
             }
             // 超过4倍禁止提交审批
-            if (isEdit && needQj && isTotalSealNumTooMore) {
+            if (isEdit && needQj && isTotalSealNumTooMore && showContranctNum) {
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');
                 return false;
             }

package/package.json

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