ztxkui 3.3.8 → 3.3.11

package/dist/UploadDemo.js

@@ -195,7 +195,9 @@ function UploadDemo() {
                 'Zmdms-Auth': token,
             }, authToken: token, data: {
                 system: '2',
-            }, ztAccept: ['.ttf'], apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", originFileList: fileList, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
+            }, 
+            // ztAccept={['.ttf']}
+            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, rowSelection: "checkbox", uploadTableRef: uploadTableRef, tableRestProps: {
                 tableHandleRef: tableHandleRef,

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

@@ -124,8 +124,24 @@ var UploadTable = function (_a) {
                 width: 80,
                 fixed: 'right',
                 render: function (text, record, index) {
+                    var operationAuth = record === null || record === void 0 ? void 0 : record.operationAuth;
+                    // '1' 预览 '2'  下载  '3'  删除
+                    var authDownloadBtn = typeof operationAuth === 'string' &&
+                        operationAuth.indexOf('2') !== -1
+                        ? true
+                        : false;
+                    var authPreviewBtn = typeof operationAuth === 'string' &&
+                        operationAuth.indexOf('1') !== -1
+                        ? true
+                        : false;
+                    var authDeleteBtn = typeof operationAuth === 'string' &&
+                        operationAuth.indexOf('3') !== -1
+                        ? true
+                        : false;
                     return (React.createElement(React.Fragment, null,
-                        showDownloadBtn && (React.createElement(Button, { type: "link", style: {
+                        (typeof operationAuth === 'string'
+                            ? authDownloadBtn
+                            : showDownloadBtn) && (React.createElement(Button, { type: "link", style: {
                                 height: 28,
                             }, onClick: function () {
                                 if (isPublic) {
@@ -147,7 +163,9 @@ var UploadTable = function (_a) {
                                     });
                                 }
                             } }, "\u4E0B\u8F7D")),
-                        showPreviewBtn && (React.createElement(Button, { type: "link", style: {
+                        (typeof operationAuth === 'string'
+                            ? authPreviewBtn
+                            : showPreviewBtn) && (React.createElement(Button, { type: "link", style: {
                                 height: 28,
                             }, onClick: function () {
                                 if ((record === null || record === void 0 ? void 0 : record.fileSize) >= 10 * 1024 * 1024) {
@@ -162,7 +180,9 @@ var UploadTable = function (_a) {
                                         onPreviewCallbackBefore(record);
                                 }
                             } }, "\u9884\u89C8")),
-                        showDeleteBtn && (React.createElement(Popconfirm, { title: "\u662F\u5426\u5220\u9664\u8BE5\u6761\u6570\u636E?", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onDeleteFile(record, index); } },
+                        (typeof operationAuth === 'string'
+                            ? authDeleteBtn
+                            : showDeleteBtn) && (React.createElement(Popconfirm, { title: "\u662F\u5426\u5220\u9664\u8BE5\u6761\u6570\u636E?", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onDeleteFile(record, index); } },
                             React.createElement(Button, { style: {
                                     height: 28,
                                 }, type: "link" }, "\u5220\u9664")))));

package/dist/components/Upload/upload.js

@@ -205,6 +205,10 @@ var Upload = function (props) {
             message.warning("\u4E0D\u652F\u6301 " + fileNameSuffix + " \u6587\u4EF6\u683C\u5F0F\uFF01");
             return AntUpload.LIST_IGNORE;
         }
+        if (fileSize === 0) {
+            message.warning("\u4E0D\u80FD\u4E0A\u4F20\u7A7A\u6587\u4EF6\uFF01");
+            return AntUpload.LIST_IGNORE;
+        }
         if (fileSize > MAXSIZE) {
             message.warning("\u6587\u4EF6\u8D85\u51FA " + MAXSIZESTR + "\uFF01");
             return AntUpload.LIST_IGNORE;

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

@@ -97,8 +97,8 @@ var QunjSeal = function (_a) {
                         justifyContent: 'space-between',
                         width: '100%',
                     } },
-                    React.createElement(Item, { name: "needQj", label: "", noBorder: true, width: "half" },
-                        React.createElement(Checkbox, { checked: checked, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u662F\u5426\u52A0\u76D6\u7FA4\u6770\u5370\u7AE0")),
+                    React.createElement(Item, { name: "needQj", label: "", valuePropName: "checked", noBorder: true, width: "half" },
+                        React.createElement(Checkbox, { checked: checked, disabled: !isEdit, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u662F\u5426\u52A0\u76D6\u7FA4\u6770\u5370\u7AE0")),
                     checked ? (React.createElement(React.Fragment, null,
                         React.createElement(Item, { name: "isTakeOut", label: "", noBorder: true, width: "half" },
                             React.createElement(Radio.Group, { style: { padding: '5px 6px' }, disabled: !isEdit },
@@ -111,8 +111,8 @@ var QunjSeal = function (_a) {
                     showContranctNum ? (React.createElement(Item, { name: "contranctNum", label: "\u5408\u540C\u4EFD\u6570", width: "all" },
                         React.createElement(InputNumber, { disabled: !isEdit, min: 0 }))) : (''),
                     getSealCheckboxGroupRender())) : (React.createElement(React.Fragment, null)))))) : (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle },
-        React.createElement(Item, { name: "needQj", label: "", noBorder: true, width: "all" },
-            React.createElement(Checkbox, { checked: checked, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u662F\u5426\u52A0\u76D6\u7FA4\u6770\u5370\u7AE0")),
+        React.createElement(Item, { name: "needQj", label: "", valuePropName: "checked", noBorder: true, width: "all" },
+            React.createElement(Checkbox, { checked: checked, disabled: !isEdit, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u662F\u5426\u52A0\u76D6\u7FA4\u6770\u5370\u7AE0")),
         React.createElement(SearchContainer, null, checked ? (React.createElement(SearchLeft, null,
             React.createElement(Item, { name: "vertifyCode", label: "\u7FA4\u6770\u9A8C\u8BC1\u7801", width: "all" },
                 React.createElement(Input, { disabled: true })),

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

@@ -35,23 +35,44 @@ var SealCheckbox = function (_a) {
         if (count < 0) {
             num = 0;
         }
-        onChange && onChange(__assign(__assign({}, (value || {})), { sealCount: num }));
+        if (typeof num !== 'number') {
+            Reflect.deleteProperty(value, 'sealCount');
+        }
+        var info = __assign(__assign({}, (value || {})), (typeof num === 'number' ? { sealCount: num } : {}));
+        if (typeof info.sealCount === 'number') {
+            info = __assign(__assign({}, info), { sealName: name, sealNo: id });
+        }
+        onChange && onChange(info, 'sealCount');
     };
-    return (React.createElement("div", { style: __assign({ padding: '0 6px' }, (isOnlyQunj
-            ? { display: 'flex', justifyContent: 'space-between' }
-            : {})) },
-        React.createElement(Checkbox, { onChange: onCheckboxChange, checked: value && value.sealNo ? true : false, disabled: !isEdit }, name),
+    return (React.createElement("div", { style: __assign({ padding: '6px' }, (isOnlyQunj ? { display: 'flex' } : {})) },
+        React.createElement(Checkbox, { onChange: onCheckboxChange, checked: value && value.sealNo ? true : false, disabled: !isEdit, style: { width: '40%' } }, name),
         React.createElement("div", null,
             React.createElement("span", null, "\u7528\u5370\u6B21\u6570\uFF1A"),
             React.createElement(InputNumber, { bordered: false, disabled: !isEdit, min: 0, size: "small", value: typeof (value === null || value === void 0 ? void 0 : value.sealCount) === 'number' ? value === null || value === void 0 ? void 0 : value.sealCount : undefined, onChange: onNumberChange, style: { borderBottom: '1px solid #e9ecf3' } }))));
 };
 var SealCheckboxGroup = function (_a) {
     var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, isOnlyQunj = _a.isOnlyQunj;
-    var onChangeHandle = function (_value, index) {
+    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;
         var valueArr = Array.isArray(value) ? __spreadArray([], value) : [];
-        valueArr.splice(index, 1, _value);
+        var vIndex = valueArr === null || valueArr === void 0 ? void 0 : valueArr.findIndex(function (item) { return item.sealNo === sealNo; });
+        if (_value.sealNo) {
+            if (typeof (_value === null || _value === void 0 ? void 0 : _value.sealCount) === 'number' && vIndex > -1) {
+                valueArr.splice(vIndex, 1, _value);
+            }
+            else {
+                if (type === 'sealCount' && typeof _value.sealCount !== 'number') {
+                    valueArr.splice(vIndex, 1);
+                }
+                else {
+                    valueArr.splice(vIndex, vIndex > -1 ? 1 : 0, _value);
+                }
+            }
+        }
+        else {
+            valueArr.splice(vIndex, 1);
+        }
         var totalSealNum = sumBy(valueArr, 'sealCount');
         onChange && onChange(valueArr);
         if (contractNum) {
@@ -79,8 +100,8 @@ var SealCheckboxGroup = function (_a) {
             if (Array.isArray(value)) {
                 itemValue = value.find(function (valueItem) { return valueItem.sealNo === item.sealNo; });
             }
-            return (React.createElement(SealCheckbox, { key: item === null || item === void 0 ? void 0 : item.sealNo, name: item === null || item === void 0 ? void 0 : item.sealName, id: item === null || item === void 0 ? void 0 : item.sealNo, value: itemValue, isEdit: isEdit, isOnlyQunj: isOnlyQunj, onChange: function (value) {
-                    onChangeHandle(value, index);
+            return (React.createElement(SealCheckbox, { key: item === null || item === void 0 ? void 0 : item.sealNo, name: item === null || item === void 0 ? void 0 : item.sealName, id: item === null || item === void 0 ? void 0 : item.sealNo, value: itemValue, isEdit: isEdit, isOnlyQunj: isOnlyQunj, onChange: function (value, type) {
+                    onChangeHandle(value, index, item.sealNo, type);
                 } }));
         })));
 };

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

@@ -396,6 +396,7 @@ var Sinatures = function (_a) {
         },
         /** 签章组件相关校验 */
         validateSealFn: function () {
+            var _a;
             // 勾选加盖电子印章时未勾选电子印章
             if (innerElectronicSeal.length === 0) {
                 var isElectronicSeal = records.filter(function (item) { return !!item.isElectronicSeal; });
@@ -409,6 +410,33 @@ var Sinatures = function (_a) {
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');
                 return false;
             }
+            // 没有确认盖章
+            if (!contractId) {
+                message.warning('请点击确认盖章按钮，确认盖章位置后方可提交！');
+                return false;
+            }
+            if (innerQunjSeal.needQj) {
+                // 合同份数为空
+                if (!(innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.contranctNum)) {
+                    message.warning('请填写合同份数！');
+                    return false;
+                }
+                // 勾选的群杰印章 没有填用印次数
+                if (((_a = innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                    innerQunjSeal.details.forEach(function (item) {
+                        if (!item.sealCount) {
+                            message.warning("\u8BF7\u586B\u5199" + item.sealName + " \u7684\u7528\u5370\u6B21\u6570\uFF01");
+                        }
+                    });
+                    if (innerQunjSeal.details.filter(function (item) { return !item.sealCount; }).length > 0) {
+                        return false;
+                    }
+                }
+                else {
+                    message.warning('请选择用印！');
+                    return false;
+                }
+            }
             return true;
         },
     }); });

package/package.json

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