ztxkui 3.4.1 → 3.4.2

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

@@ -33,14 +33,14 @@ var SealCheckbox = function (_a) {
     var onNumberChange = function (count) {
         var _a, _b;
         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;
-        if (!contractNum && showContranctNum) {
-            message.info('请输入合同份数！');
-            return;
-        }
         var num = count;
         if (count < 0) {
             num = 0;
         }
+        if (!contractNum && showContranctNum) {
+            message.info('请输入合同份数！');
+            num = null;
+        }
         if (typeof num !== 'number') {
             Reflect.deleteProperty(value, 'sealCount');
         }

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

@@ -287,12 +287,12 @@ var Sinatures = function (_a) {
             },
         },
         {
-            title: '群杰印章',
-            key: 'qunjSeal',
-            dataIndex: 'qunjSeal',
+            title: '电子印章',
+            key: 'electronicSeal',
+            dataIndex: 'electronicSeal',
             render: function (value, row, index) {
                 var obj = {
-                    children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, request: request, flowId: flowId, caseId: caseId, ZT_API_BASEURL: ZT_API_BASEURL, isEdit: isEdit, handleRef: handleRef, isOnlyQunj: isOnlyQunj, showContranctNum: showContranctNum })),
+                    children: (React.createElement(ElectronicSeal, { value: electronicSeal, request: request, flowId: flowId, deptId: deptId, onChange: electronicSealChangeHandle, isEdit: isEdit })),
                     props: {},
                 };
                 obj.props['rowSpan'] = index === 0 ? records.length : 0;
@@ -300,12 +300,12 @@ var Sinatures = function (_a) {
             },
         },
         {
-            title: '电子印章',
-            key: 'electronicSeal',
-            dataIndex: 'electronicSeal',
+            title: '群杰印章',
+            key: 'qunjSeal',
+            dataIndex: 'qunjSeal',
             render: function (value, row, index) {
                 var obj = {
-                    children: (React.createElement(ElectronicSeal, { value: electronicSeal, request: request, flowId: flowId, deptId: deptId, onChange: electronicSealChangeHandle, isEdit: isEdit })),
+                    children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, request: request, flowId: flowId, caseId: caseId, ZT_API_BASEURL: ZT_API_BASEURL, isEdit: isEdit, handleRef: handleRef, isOnlyQunj: isOnlyQunj, showContranctNum: showContranctNum })),
                     props: {},
                 };
                 obj.props['rowSpan'] = index === 0 ? records.length : 0;
@@ -341,19 +341,23 @@ var Sinatures = function (_a) {
             setCheckSealVisible(e.target.checked ? true : hasElecSeal.length > 1 ? true : false);
         }
         setRecords(function (preRecords) {
-            var _a, _b;
+            var _a;
             var newRecords = preRecords.slice();
             // 勾选添加水印的前提 需要勾选加盖电子印章
-            if (type === 'isWatermark' && !newRecords[index].isElectronicSeal) {
-                message.info('请先选择是否加盖电子印章！');
-                return newRecords;
-            }
+            // if (type === 'isWatermark' && !newRecords[index].isElectronicSeal) {
+            //   message.info('请先选择是否加盖电子印章！');
+            //   return newRecords;
+            // }
             // 取消勾选电子印章时 不可添加水印
-            if (type === 'isElectronicSeal' && !e.target.checked) {
-                newRecords.splice(index, 1, __assign(__assign({}, newRecords[index]), (_a = { isWatermark: 0 }, _a[type] = 0, _a)));
-                return newRecords;
-            }
-            newRecords.splice(index, 1, __assign(__assign({}, newRecords[index]), (_b = {}, _b[type] = e.target.checked ? 1 : 0, _b)));
+            // if (type === 'isElectronicSeal' && !e.target.checked) {
+            //   newRecords.splice(index, 1, {
+            //     ...newRecords[index],
+            //     isWatermark: 0,
+            //     [type]: 0,
+            //   });
+            //   return newRecords;
+            // }
+            newRecords.splice(index, 1, __assign(__assign({}, newRecords[index]), (_a = {}, _a[type] = e.target.checked ? 1 : 0, _a)));
             return newRecords;
         });
     }

package/package.json

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