ztxkui 4.2.23-578 → 4.2.23-579

package/dist/UI/Detail/index.js

@@ -1,7 +1,9 @@
 import i18next from 'ztxkutils/dist/i18next';
-import React, { useMemo } from 'react';
+import React, { useMemo, useRef } from 'react';
 import { DetailHeader, OperationBtnGroup, Container, Button, InputNumber, Input, Tabs, Dropdown, DatePicker, } from '../../index.build';
+import dayjs from 'dayjs';
 var Detail = function () {
+    var rangeDatesRef = useRef(null);
     var items = useMemo(function () {
         return Array.from({ length: 26 }, function (_, i) { return ({
             name: "key" + i,
@@ -16,7 +18,24 @@ var Detail = function () {
         React.createElement(DatePicker.TimePicker, null),
         React.createElement(DatePicker.WeekPicker, null),
         React.createElement(DatePicker.YearPicker, null),
-        React.createElement(DatePicker.RangePicker, null),
+        React.createElement(DatePicker.RangePicker, { disabledDate: function (current) {
+                var _a;
+                if (!((_a = rangeDatesRef.current) === null || _a === void 0 ? void 0 : _a[0])) {
+                    return false;
+                }
+                return (dayjs(current).isAfter(dayjs(rangeDatesRef.current[0]).add(366, 'day')) ||
+                    dayjs(current).isBefore(dayjs(rangeDatesRef.current[0]).subtract(366, 'day')));
+            }, onCalendarChange: function (dates) {
+                rangeDatesRef.current = dates;
+            }, onOpenChange: function (open) {
+                var _a;
+                if (!open) {
+                    // 只在半选状态（只选了开始日期）关闭时清空，完整选择后保留
+                    if (!((_a = rangeDatesRef.current) === null || _a === void 0 ? void 0 : _a[1])) {
+                        rangeDatesRef.current = null;
+                    }
+                }
+            } }),
         React.createElement("div", null, i18next.t('详情头部')),
         React.createElement(DetailHeader, { headerName: i18next.t('详情头部'), createrName: i18next.t('创建人'), createDate: "2023-08-01", code: "123456", type: i18next.t('巡检'), detailType: i18next.t('风控巡检'), progress: i18next.t('已完成') }),
         React.createElement("div", { style: { width: 140 } },

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

@@ -424,15 +424,9 @@ var Sinatures = function (_a) {
                         .filter(Boolean);
                     var hasMatch = requiredIds.some(function (id) { return selectedSealIds_1.has(id); });
                     if (!hasMatch) {
-                        var requiredSealNames = requiredIds
-                            .map(function (id) {
-                            var found = electronicList.find(function (s) { return s.sealId + '' === id; });
-                            return (found === null || found === void 0 ? void 0 : found.sealName) || id;
-                        })
-                            .join('、');
                         var msg = i18next.t('当前所选的{{sealName}}，要求必须和{{requiredSealNames}}其中之一一起使用，请重新勾选印章。', {
                             sealName: seal.sealName,
-                            requiredSealNames: requiredSealNames,
+                            requiredSealNames: seal.useWithSealNames,
                         });
                         message.warning(msg);
                         return;
@@ -1128,7 +1122,7 @@ var Sinatures = function (_a) {
         },
         /** 签章组件相关校验 */
         validateSealFn: function () { return __awaiter(void 0, void 0, void 0, function () {
-            var hasElectronicSeal, selectedSealIds_2, _i, electronicList_2, seal, requiredIds, hasMatch, requiredSealNames;
+            var hasElectronicSeal, selectedSealIds_2, _i, electronicList_2, seal, requiredIds, hasMatch;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1212,15 +1206,9 @@ var Sinatures = function (_a) {
                                         .filter(Boolean);
                                     hasMatch = requiredIds.some(function (id) { return selectedSealIds_2.has(id); });
                                     if (!hasMatch) {
-                                        requiredSealNames = requiredIds
-                                            .map(function (id) {
-                                            var found = electronicList.find(function (s) { return s.sealId + '' === id; });
-                                            return (found === null || found === void 0 ? void 0 : found.sealName) || id;
-                                        })
-                                            .join('、');
                                         message.warning(i18next.t('当前所选的{{sealName}}，要求必须和{{requiredSealNames}}其中之一一起使用，请重新勾选印章。', {
                                             sealName: seal.sealName,
-                                            requiredSealNames: requiredSealNames,
+                                            requiredSealNames: seal.useWithSealNames,
                                         }));
                                         return [2 /*return*/, false];
                                     }

package/dist/components/electron-signatures/content.js

@@ -461,7 +461,7 @@ var ElectronSignatures = function (props) {
             },
             /** 验证组件是否通过校验 */
             validateElectronTable: function (validateInfo) { return __awaiter(void 0, void 0, void 0, function () {
-                var validateAttachType, resultData, submitData, currentData, _a, _b, isQunjKey, _c, qunjSealKey, fileList, hasElectronicSeal, electronicSealFileList, hasQunj, electronicSealIdList, docAttachMap, qunjSeal, contractId, isContranctNum, isEdit, needDg, needQys, needQj, preElectronicSealIdList, qunjChecked, isOnlyQj, isValidateAttachTypeIndex, msg, isValidateDgIndex, msg, isValidateAttachType, msg, msg, checkElectron, electronicSealedFileList_1, isMoreQunjCountIndex, msg, isMoreQunjCount, msg, isCheckTakeOutNoAddress, isCheckTakeOutNoAddressIndex, msg, msg, msg, hasNoWritContranctNum, msg, hasNoCheckedQjSeal, msg, noNumSealName_1, hasNoNumCheckedQjSeal, msg, msg, electronList_2, selectedSealIds_1, _i, electronList_1, seal, requiredIds, hasMatch, requiredSealNames, msg;
+                var validateAttachType, resultData, submitData, currentData, _a, _b, isQunjKey, _c, qunjSealKey, fileList, hasElectronicSeal, electronicSealFileList, hasQunj, electronicSealIdList, docAttachMap, qunjSeal, contractId, isContranctNum, isEdit, needDg, needQys, needQj, preElectronicSealIdList, qunjChecked, isOnlyQj, isValidateAttachTypeIndex, msg, isValidateDgIndex, msg, isValidateAttachType, msg, msg, checkElectron, electronicSealedFileList_1, isMoreQunjCountIndex, msg, isMoreQunjCount, msg, isCheckTakeOutNoAddress, isCheckTakeOutNoAddressIndex, msg, msg, msg, hasNoWritContranctNum, msg, hasNoCheckedQjSeal, msg, noNumSealName_1, hasNoNumCheckedQjSeal, msg, msg, electronList, selectedSealIds_1, _i, electronList_1, seal, requiredIds, hasMatch, msg;
                 var _d, _e, _f, _g, _h, _j, _k;
                 return __generator(this, function (_l) {
                     validateAttachType = (validateInfo || {}).validateAttachType;
@@ -767,9 +767,9 @@ var ElectronSignatures = function (props) {
                     }
                     // 5.1 校验契约锁印章中带有"必须共同使用"标识的印章（mustUseWithOthers + useWithSealIds）
                     if (isEdit && needQys && electronicSealIdList.length > 0) {
-                        electronList_2 = currentData.electronList || [];
+                        electronList = currentData.electronList || [];
                         selectedSealIds_1 = new Set(electronicSealIdList.map(function (id) { return id + ''; }));
-                        for (_i = 0, electronList_1 = electronList_2; _i < electronList_1.length; _i++) {
+                        for (_i = 0, electronList_1 = electronList; _i < electronList_1.length; _i++) {
                             seal = electronList_1[_i];
                             if (selectedSealIds_1.has(seal.sealId + '') &&
                                 seal.mustUseWithOthers &&
@@ -782,15 +782,9 @@ var ElectronSignatures = function (props) {
                                     return selectedSealIds_1.has(id);
                                 });
                                 if (!hasMatch) {
-                                    requiredSealNames = requiredIds
-                                        .map(function (id) {
-                                        var found = electronList_2.find(function (s) { return s.sealId + '' === id; });
-                                        return (found === null || found === void 0 ? void 0 : found.sealName) || id;
-                                    })
-                                        .join('、');
                                     msg = i18next.t('当前所选的{{sealName}}，要求必须和{{requiredSealNames}}其中之一一起使用，请重新勾选印章。', {
                                         sealName: seal.sealName,
-                                        requiredSealNames: requiredSealNames,
+                                        requiredSealNames: seal.useWithSealNames,
                                     });
                                     message.warning(msg);
                                     return [2 /*return*/, Promise.reject(msg)];

package/dist/components/electron-signatures/hooks/useParseElectronSetting.js

@@ -81,15 +81,9 @@ export default function useParseElectronSetting(options) {
                         .filter(Boolean);
                     var hasMatch = requiredIds.some(function (id) { return selectedSealIds_1.has(id); });
                     if (!hasMatch) {
-                        var requiredSealNames = requiredIds
-                            .map(function (id) {
-                            var found = electronList.find(function (s) { return s.sealId + '' === id; });
-                            return (found === null || found === void 0 ? void 0 : found.sealName) || id;
-                        })
-                            .join('、');
                         var msg = i18next.t('当前所选的{{sealName}}，要求必须和{{requiredSealNames}}其中之一一起使用，请重新勾选印章。', {
                             sealName: seal.sealName,
-                            requiredSealNames: requiredSealNames,
+                            requiredSealNames: seal.useWithSealNames,
                         });
                         message.warning(msg);
                         return;

package/package.json

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