ztxkui 3.8.1 → 3.8.3

package/dist/Demo.js

@@ -6,7 +6,7 @@ var selectStyle = { width: '200px' };
 function request(options) {
     return fetch(options.url + "?" + stringify(options.params), {
         headers: {
-            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQzNDkwNjg2MjYwMjI4MDk3LDEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQ2ODAzNTM1MTYyNTI4NTYzNCwxNTQyMDc2MzA4NTc4MDI1NDc0IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMSwxNDY3MDE1OTc1NDg0NzYwMDY2LDE0NjgwMzQ0MzcxNTc5NjE3MjksMTQ4MDgyOTMzNzkzOTEzMjQxNyIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjU4NDc2NTY5LCJvcmdfbmFtZSI6bnVsbCwianRpIjoiMGI2OWZjMTYtODhkMS00YjIxLWIwMWEtYzFkY2Y0MjVmZGVlIiwibWVtYmVyX2lkIjoxLCJjb21wYW55X2lkIjpudWxsLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJudWxsLGFkbWluLGFkbWluLGFkbWluIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLHVzZXIsYWRtaW4sYWRtaW4iLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjpudWxsLCJuaWNrX25hbWUiOiLpmYjkuprpm4QiLCJjb21wYW55X25hbWUiOm51bGwsImRlcHRfaWQiOiIiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.o-fSqi9R0WGk62TpZpt5dC3S_yIQV4ngbFM6Yj4hJO0',
+            'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi6ZmI5Lqa6ZuEMTEiLCJlbXBfbmFtZSI6IumZiOS6mumbhDExIiwiZW1wX251bWJlciI6IllHMjIwOTAwMiIsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEMTEiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQ2ODAzNTM1MTYyNTI4NTYzNCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2ODAzNDQzNzE1Nzk2MTcyOSIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjY0NDQyMjI1LCJvcmdfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWbouiCoeS7veaciemZkOWFrOWPuCIsImp0aSI6ImIwNzQzYzdkLWJjZDgtNDZkMy1hM2JkLWRkYTUzNTdiMWJlNiIsIm1lbWJlcl9pZCI6MTU3Mjg3Mzg4ODM3MDk3MDYyNSwiY29tcGFueV9pZCI6MTI5NTkwODYyNzk4NDY3MDcyMiwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOiLph43luobkuK3mi5Mt5bel56iL5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbImFkbWluIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTU3Mjg3NDE0MjkyMzI3NjI4OSIsIm9yZ19pZCI6MTQ1NzUyNzc2NTkxODUxNTIwMSwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEMTEiLCJjb21wYW55X25hbWUiOiLmtZnllYbkuK3mi5Ppm4blm6LvvIjph43luobvvInmnInpmZDlhazlj7giLCJkZXB0X2lkIjoiMTI5NTkwOTU5NDU2NjIyMTgyNiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50Ijoi6ZmI5Lqa6ZuEMTEiLCJyZXN1bWVfaWQiOm51bGx9.NHWV_i8yisajX0UKi1Z1_W8EXoHrhf_jPv6TChX3DgI',
         },
         method: options.method,
     }).then(function (response) { return response.json(); });
@@ -23,6 +23,9 @@ function Demo() {
         tenantId: '000000',
         isCreateUser: 0,
     })[0];
+    var _g = useState(JSON.stringify({
+        status: 50,
+    })), params1 = _g[0], setParams1 = _g[1];
     // 模拟接口请求
     useEffect(function () {
         var timeoutId = setTimeout(function () {
@@ -91,23 +94,28 @@ function Demo() {
                 console.log(value, option, fullData);
             } }),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
-        React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/page", params: JSON.stringify({
-                status: 50,
-                companyId: '1397074605412696066',
-            }), request: request, joinKey: "depName" }),
         React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u5E76\u7F13\u5B58\u6570\u636E"),
-        React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/page", params: JSON.stringify({
-                status: 50,
-                companyId: '1397074605412696066',
-            }), request: request, isCatch: true }),
         React.createElement("h2", null, "\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22"),
         React.createElement("button", { onClick: function () { return setValue('1462433051208762629'); } }, "\u4FEE\u6539"),
+        React.createElement("p", null, "\u8FDC\u7A0B\u641C\u7D22"),
         React.createElement(EnhanceSelect, { style: selectStyle, 
             // defaultList={list}
             placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, isHandAddItem: true, isRemoteSearchDataKey: false, dataKey: "id", titleKey: "empName", value: value, showAll: true, onChange: function (value, option, fullData) {
                 setValue(value);
             }, params: JSON.stringify(params), 
             // value={value}
-            mode: "multiple", isPage: true })));
+            mode: "multiple", isPage: true, 
+            // defaultList={defaultList}
+            isClickRequest: true }),
+        React.createElement("p", null, "\u4E00\u6B21\u6027\u52A0\u8F7D\u6570\u636E"),
+        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u4E00\u6B21\u6027\u52A0\u8F7D\u6570\u636E", url: "http://192.168.0.83:8000/api/zmdms-system/company/list", request: request, dataKey: "id", titleKey: "name", isClickRequest: true }),
+        React.createElement("p", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
+        React.createElement("button", { onClick: function () {
+                setParams1(JSON.stringify({
+                    status: 50,
+                    companyId: '1414851965111283713',
+                }));
+            } }, "\u4FEE\u6539"),
+        React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u5F02\u6B65\u83B7\u53D6\u6570\u636E", url: "http://192.168.0.83:8000/api/zmdms-user/page", params: params1, request: request, joinKey: "depName", dataKey: "id", titleKey: "name", remoteSearch: true, isRemoteSearchDataKey: false, isClickRequest: true })));
 }
 export default Demo;

package/dist/DemoCom/BasicDemo.js

@@ -56,6 +56,7 @@ function BasicDemo() {
         dayjs('2022-05-31'),
     ]), rangeValue = _b[0], setRangeValue = _b[1];
     var _c = useState(false), loading = _c[0], setLoading = _c[1];
+    var _d = useState(), iValue = _d[0], setIValue = _d[1];
     return (React.createElement(Container, { loading: loading, isFlex: true },
         React.createElement(Button, { onClick: function () {
                 setLoading(true);
@@ -176,6 +177,8 @@ function BasicDemo() {
             } }, "\u8DF3\u8F6C"),
         React.createElement(Button, { type: "link", onClick: function () {
                 console.log(111);
-            }, showCopy: true }, "\u6211\u662F\u4E00\u4E2A\u94FE\u63A51111111111111111111")));
+                console.log(iValue);
+            }, showCopy: true }, "\u6211\u662F\u4E00\u4E2A\u94FE\u63A51111111111111111111"),
+        React.createElement(Input, { value: iValue, onChange: function (e) { return setIValue(e.target.value); } })));
 }
 export default BasicDemo;

package/dist/DemoCom/FormDemo.js

@@ -130,6 +130,7 @@ var FormDemo = function () {
                 React.createElement(SearchRight, { onSearchHandle: function () {
                         var _a;
                         (_a = handleRef.current) === null || _a === void 0 ? void 0 : _a.setToggleHandle(false);
+                        console.log(form.getFieldsValue());
                     }, onResetHandle: function () { } })))));
 };
 export default FormDemo;

package/dist/DemoCom/TableDemo.js

@@ -588,14 +588,16 @@ var TableDemo = function () {
             },
         },
         {
-            title: '编辑字段1',
+            title: '编辑字段11',
             width: 220,
             dataIndex: 'test3',
             key: 'test3',
             // 普通的输入框
             editable: true,
+            required: true,
             validate: {
                 validate: function (value, record, index, title) {
+                    console.log(value);
                     if (Object.keys(tableConfig).length === 2 || !value) {
                         return Promise.reject({
                             errorFields: [
@@ -916,7 +918,7 @@ var TableDemo = function () {
             // initColumns={columns}
             columns: columns, dataSource: records, rowKey: "id", tableHandleRef: tableHandleRef, 
             // 配置表格列
-            configInfo: tableConfig, 
+            // configInfo={tableConfig}
             // 添加动态列配置
             showColumnDynamic: true, showColumnDynamicKey: "testkey", 
             // onDynamicChange={onDynamicChange}

package/dist/components/EnhanceSelect/index.d.ts

@@ -127,6 +127,10 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 是否需要选中复制到剪切板
      */
     isCopy?: boolean;
+    /**
+     * 是否点击时才请求
+     */
+    isClickRequest?: boolean;
 }
 /**
  * 增强下拉框功能组件
@@ -143,6 +147,6 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
  *    { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
-declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, timeout, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, onSearch, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, joinKey, joinStr, lineFeedKey, lineFeedStr, mustHasParams, disabledValues, searchDeleteKeys, isHandAddItem, isPage, currentSize, isCopy, onBlur, onFocus, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, timeout, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, onSearch, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, joinKey, joinStr, lineFeedKey, lineFeedStr, mustHasParams, disabledValues, searchDeleteKeys, isHandAddItem, isPage, currentSize, isCopy, onBlur, onFocus, isClickRequest, ...restProps }: IProps<VT>): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
 export default _default;

package/dist/components/EnhanceSelect/index.js

@@ -100,7 +100,7 @@ function textContent(children) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 function EnhanceSelect(_a) {
-    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 60000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, onSearch = _a.onSearch, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, lineFeedKey = _a.lineFeedKey, _h = _a.lineFeedStr, lineFeedStr = _h === void 0 ? '-' : _h, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, searchDeleteKeys = _a.searchDeleteKeys, isHandAddItem = _a.isHandAddItem, isPage = _a.isPage, _j = _a.currentSize, currentSize = _j === void 0 ? 30 : _j, isCopy = _a.isCopy, onBlur = _a.onBlur, onFocus = _a.onFocus, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "onSearch", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "mustHasParams", "disabledValues", "searchDeleteKeys", "isHandAddItem", "isPage", "currentSize", "isCopy", "onBlur", "onFocus"]);
+    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 60000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, onSearch = _a.onSearch, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, lineFeedKey = _a.lineFeedKey, _h = _a.lineFeedStr, lineFeedStr = _h === void 0 ? '-' : _h, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, searchDeleteKeys = _a.searchDeleteKeys, isHandAddItem = _a.isHandAddItem, isPage = _a.isPage, _j = _a.currentSize, currentSize = _j === void 0 ? 30 : _j, isCopy = _a.isCopy, onBlur = _a.onBlur, onFocus = _a.onFocus, isClickRequest = _a.isClickRequest, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "onSearch", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "mustHasParams", "disabledValues", "searchDeleteKeys", "isHandAddItem", "isPage", "currentSize", "isCopy", "onBlur", "onFocus", "isClickRequest"]);
     var currentClick = useRef(true);
     // 下拉数据源
     var _k = useFetchState([]), selectList = _k[0], setSelectList = _k[1];
@@ -124,6 +124,8 @@ function EnhanceSelect(_a) {
     var _u = useState(0), count = _u[0], setCount = _u[1];
     // 手动清空数据
     var handleClearDataRef = useRef(false);
+    // 是否自动请求
+    var isAutoRequest = useRef(false); // 请求过了
     // 处理value
     var newValue = useMemo(function () {
         var _a, _b;
@@ -370,24 +372,18 @@ function EnhanceSelect(_a) {
         }
     }, [list, setSelectList]);
     // 2、如果是走接口请求的，url必须传递
-    useEffect(function () {
+    var sendRequest = useCallback(function () {
         if (!url || remoteSearch) {
             return;
         }
-        // console.log('TEST: 异步获取');
         if (isCatch) {
-            // 如果是走缓存的话，那么先往缓存数据中取，有没有当前数据，如果没有就发请求
             if (enhanceSelectCatchObj) {
                 enhanceSelectCatchObj[url] = enhanceSelectCatchObj[url]
                     ? enhanceSelectCatchObj[url]
                     : {};
                 var catchData = enhanceSelectCatchObj[url];
                 var catchDataKey = params ? JSON.stringify(params) : 'single';
-                if (catchData[catchDataKey]) {
-                    // 读取缓存数据
-                    setSelectList(catchData[catchDataKey]);
-                }
-                else {
+                if (!catchData[catchDataKey]) {
                     // 发送接口请求，并设置缓存数据
                     getDataHandle(request, { url: url, params: params, method: method, timeout: timeout }, {
                         appointObj: {
@@ -399,7 +395,6 @@ function EnhanceSelect(_a) {
             }
         }
         else {
-            // 直接发送接口请求
             getDataHandle(request, {
                 url: url,
                 params: params,
@@ -408,19 +403,119 @@ function EnhanceSelect(_a) {
             });
         }
     }, [
-        url,
-        params,
+        getDataHandle,
+        isCatch,
         method,
-        timeout,
+        params,
         request,
+        timeout,
+        url,
+        remoteSearch,
+    ]);
+    useEffect(function () {
+        if (!url || remoteSearch) {
+            return;
+        }
+        // console.log('TEST: 异步获取');
+        if (isCatch) {
+            // 如果是走缓存的话，那么先往缓存数据中取，有没有当前数据，如果没有就发请求
+            if (enhanceSelectCatchObj) {
+                enhanceSelectCatchObj[url] = enhanceSelectCatchObj[url]
+                    ? enhanceSelectCatchObj[url]
+                    : {};
+                var catchData = enhanceSelectCatchObj[url];
+                var catchDataKey = params ? JSON.stringify(params) : 'single';
+                if (catchData[catchDataKey]) {
+                    // 读取缓存数据
+                    setSelectList(catchData[catchDataKey]);
+                }
+                else {
+                    if (isClickRequest) {
+                        isAutoRequest.current = false;
+                        return;
+                    }
+                    // 发送接口请求，并设置缓存数据
+                    sendRequest();
+                    // getDataHandle(
+                    //   request,
+                    //   { url, params, method, timeout },
+                    //   {
+                    //     appointObj: {
+                    //       obj: catchData,
+                    //       key: catchDataKey,
+                    //     },
+                    //   }
+                    // );
+                }
+            }
+        }
+        else {
+            if (isClickRequest) {
+                return;
+            }
+            // 直接发送接口请求
+            sendRequest();
+            // getDataHandle(request, {
+            //   url,
+            //   params,
+            //   method,
+            //   timeout,
+            // });
+        }
+    }, [
+        // url,
+        // params,
+        // method,
+        // timeout,
+        // request,
+        // isCatch,
+        // setSelectList,
+        // getDataHandle,
+        // remoteSearch,
         isCatch,
-        setSelectList,
-        getDataHandle,
+        isClickRequest,
+        params,
         remoteSearch,
+        sendRequest,
+        setSelectList,
+        url,
     ]);
     // 3、远程搜索，url必须传递
     // 关于远程查询，最好的做法还是后台根据主键再去查一次详情数据，这样就能保证
     // 查出来的数据就能保证不止一条
+    var sendRemoteRequest = useCallback(function () {
+        if (!url || !remoteSearch) {
+            return;
+        }
+        if (firstLoading) {
+            // console.log('已经通过id访问了');
+            return;
+        }
+        if (!isRemoteSearchDataKey) {
+            setFirstLoading(true);
+            return;
+        }
+        if (!restProps.value) {
+            // console.log('第一次请求数据');
+            getRemoteDataHandle('', '');
+        }
+        else {
+            if (typeof restProps.value === 'string' ||
+                (Array.isArray(restProps.value) && restProps.value.length > 0)) {
+                // console.log('第二次请求数据，默认为需要根据主键去请求', restProps.value);
+                setFirstLoading(true);
+                getRemoteDataHandle('', restProps.value);
+            }
+        }
+    }, [
+        url,
+        remoteSearch,
+        firstLoading,
+        isRemoteSearchDataKey,
+        setFirstLoading,
+        restProps.value,
+        getRemoteDataHandle,
+    ]);
     useEffect(function () {
         if (!url || !remoteSearch) {
             return;
@@ -437,6 +532,10 @@ function EnhanceSelect(_a) {
             setFirstLoading(true);
             return;
         }
+        if (isClickRequest) {
+            isAutoRequest.current = false;
+            return;
+        }
         if (!restProps.value) {
             // console.log('第一次请求数据');
             getRemoteDataHandle('', '');
@@ -457,11 +556,33 @@ function EnhanceSelect(_a) {
         firstLoading,
         isRemoteSearchDataKey,
         setFirstLoading,
+        isClickRequest,
+    ]);
+    var sendRemoteRequest1 = useCallback(function () {
+        if (!url || !remoteSearch) {
+            return;
+        }
+        // console.log('TEST: 远程搜索');
+        // 这种情况不需要启用远程搜索key值
+        if (!isRemoteSearchDataKey) {
+            getRemoteDataHandle('', '');
+            setFirstLoading(true);
+        }
+    }, [
+        url,
+        remoteSearch,
+        setFirstLoading,
+        getRemoteDataHandle,
+        isRemoteSearchDataKey,
     ]);
     useEffect(function () {
         if (!url || !remoteSearch) {
             return;
         }
+        if (isClickRequest) {
+            isAutoRequest.current = false;
+            return;
+        }
         // console.log('TEST: 远程搜索');
         // 这种情况不需要启用远程搜索key值
         if (!isRemoteSearchDataKey) {
@@ -474,6 +595,7 @@ function EnhanceSelect(_a) {
         setFirstLoading,
         getRemoteDataHandle,
         isRemoteSearchDataKey,
+        isClickRequest,
     ]);
     // 数据合并
     function concatData(originalData, newData) {
@@ -663,13 +785,13 @@ function EnhanceSelect(_a) {
     };
     // 焦点事件
     var onFocusHandle = function (e) {
-        // console.log('焦点事件');
+        console.log('焦点事件');
         setIsOpen(true);
         currentClick.current = false;
         onFocus && onFocus(e);
     };
     var onBlurHandle = function (e) {
-        // console.log('失去焦点事件');
+        console.log('失去焦点事件');
         setIsOpen(false);
         currentClick.current = false;
         onBlur && onBlur(e);
@@ -700,6 +822,12 @@ function EnhanceSelect(_a) {
     // 点击时
     var onClickHandle = function (e) {
         // console.log('点击事件', currentClick.current);
+        if (!isAutoRequest.current && isClickRequest) {
+            isAutoRequest.current = true;
+            sendRequest();
+            sendRemoteRequest();
+            sendRemoteRequest1();
+        }
         if (currentClick.current) {
             console.log(e.nativeEvent.target.getAttribute('class'));
             var className = '';
@@ -734,6 +862,10 @@ function EnhanceSelect(_a) {
     };
     return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : onSearchHandleInner, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, 
         // getPopupContainer={(trigger) => trigger || document.body}
-        open: isOpen, onPopupScroll: onPopupScrollHandle }, restProps, { value: newValue, disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
+        open: isOpen, onPopupScroll: onPopupScrollHandle }, restProps, { value: newValue, 
+        // 这里需要注释掉，因为修改了一部分逻辑
+        disabled: remoteSearch || isClickRequest
+            ? restProps.disabled
+            : loading || restProps.disabled }), renderSelectOption()));
 }
 export default memo(EnhanceSelect);

package/dist/components/Input/input.js

@@ -14,6 +14,11 @@ import Modal from '../Modal';
 import { Input as AntInput } from 'antd';
 import classNames from 'classnames';
 function Input(props) {
+    // const onBlur = (e) => {
+    //   props.onBlur && props.onBlur(e);
+    //   e.target.value = e.target.value.trim();
+    //   props.onChange && props.onChange(e);
+    // };
     return React.createElement(AntInput, __assign({}, props));
 }
 var TextArea = React.forwardRef(function (props, ref) {

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

@@ -40,12 +40,6 @@ var DgColumns = function (_a) {
             return newRecords;
         });
     }
-    /** 获取taskId */
-    var getTaskId = function (id, index) {
-        handleRef.current.setTemplateData({
-            taskId: id,
-        }, index);
-    };
     var dgColumns = [
         {
             title: '存入样板',
@@ -74,7 +68,7 @@ var DgColumns = function (_a) {
             key: 'compareAttachId',
             fixed: 'left',
             render: function (text, record, index) {
-                return record.attachType === '001' ? (React.createElement(CompareResult, { record: record, index: index, request: request, getTaskId: getTaskId, isEdit: isEdit })) : ('');
+                return record.attachType === '001' ? (React.createElement(CompareResult, { record: record, index: index, request: request })) : ('');
             },
         },
     ];

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

@@ -7,8 +7,6 @@ interface IProps {
     record: any;
     index: number;
     request?: any;
-    getTaskId: (id: any, index: number) => void;
-    isEdit: boolean;
 }
 declare const CompareResult: React.FC<IProps>;
 export default CompareResult;

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

@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 // ztxkui公共组件
 import { Button, message } from '../../../../index';
 var CompareResult = function (_a) {
-    var record = _a.record, index = _a.index, request = _a.request, isEdit = _a.isEdit, getTaskId = _a.getTaskId;
+    var record = _a.record, index = _a.index, request = _a.request;
     // 设置查看比对结果按钮的loading状态
     var _b = useState(false), resultLoading = _b[0], setResultLoading = _b[1];
     var viewCompareResult = function () {

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

@@ -25,6 +25,8 @@ interface IProps {
     /** 查看盖章页面 */
     viewSealPageFn: any;
     showContranctNum: boolean;
+    request: any;
+    needSaveTemplate: boolean;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

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

@@ -15,10 +15,12 @@ var __assign = (this && this.__assign) || function () {
 };
 import React, { memo } from 'react';
 import { Table, Button } from '../../../../index';
+import { Switch } from 'antd';
 // 自定义组件
 import AttachOperation from './AttachOperation';
+import CompareResult from './CompareResult';
 var DetailTable = function (_a) {
-    var needQj = _a.needQj, needQys = _a.needQys, records = _a.records, qunjSeal = _a.qunjSeal, electronicSeal = _a.electronicSealIdList, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, viewSealPageFn = _a.viewSealPageFn, contractId = _a.contractId, electronicList = _a.electronicList, sealList = _a.sealList, querySealStatus = _a.querySealStatus, showContranctNum = _a.showContranctNum;
+    var needQj = _a.needQj, needQys = _a.needQys, records = _a.records, qunjSeal = _a.qunjSeal, electronicSeal = _a.electronicSealIdList, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, viewSealPageFn = _a.viewSealPageFn, contractId = _a.contractId, electronicList = _a.electronicList, sealList = _a.sealList, querySealStatus = _a.querySealStatus, showContranctNum = _a.showContranctNum, request = _a.request, needSaveTemplate = _a.needSaveTemplate;
     var authToken = token || '';
     /** 下载水印附件 */
     var downFileFn = function (_record) {
@@ -71,6 +73,42 @@ var DetailTable = function (_a) {
                     React.createElement(AttachOperation, { ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, token: authToken, attachId: record === null || record === void 0 ? void 0 : record.attachId, attachName: record === null || record === void 0 ? void 0 : record.attachName, attachSize: record === null || record === void 0 ? void 0 : record.attachSize })));
             },
         },
+        {
+            title: '合同',
+            key: 'needDg',
+            dataIndex: 'needDg',
+            children: [
+                {
+                    title: '合同比对模板',
+                    key: 'templateAttachId',
+                    dataIndex: 'templateAttachId',
+                    width: 160,
+                    render: function (text, record, index) {
+                        return record.attachTypeName === '合同本身' ? (React.createElement(React.Fragment, null,
+                            React.createElement("div", { style: { textOverflow: 'ellipsis', overflow: 'hidden' }, title: record.templateAttachName || '' }, record.templateAttachName || ''),
+                            React.createElement("div", null, record.templateCrNo || ''))) : ('');
+                    },
+                },
+                {
+                    title: '合同比对结果',
+                    key: 'compareAttachId',
+                    dataIndex: 'compareAttachId',
+                    width: 100,
+                    render: function (text, record, index) {
+                        return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request })) : ('');
+                    },
+                },
+                {
+                    title: '保存为模板',
+                    key: 'templateAttachId',
+                    dataIndex: 'templateAttachId',
+                    width: 90,
+                    render: function (text, record, index) {
+                        return needSaveTemplate ? (React.createElement(Switch, { checked: !!record.isCustomerReference, disabled: true })) : ('');
+                    },
+                },
+            ],
+        },
         {
             title: '水印',
             key: 'isWatermark',
@@ -84,7 +122,7 @@ var DetailTable = function (_a) {
             title: '电子印章',
             key: 'electronicSeal',
             dataIndex: 'electronicSeal',
-            width: '20%',
+            width: 230,
             render: function (value, row, index) {
                 var obj = {
                     children: (React.createElement("div", { style: { height: '100%', padding: '10px 0' } },

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

@@ -13,6 +13,6 @@ var TemplateAttach = function (_a) {
         React.createElement("div", null,
             React.createElement(Button, { type: "link", disabled: !isEdit, onClick: function () {
                     openCustomerModalHandle && openCustomerModalHandle(index);
-                } }, "\u9009\u62E9\u6BD4\u5BF9\u6A21\u7248"))));
+                } }, "\u9009\u62E9\u6BD4\u5BF9\u6A21\u677F"))));
 };
 export default TemplateAttach;

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

@@ -240,12 +240,6 @@ var Sinatures = function (_a) {
             getQunjSealList();
         }
     }, [getElectronicList, getQunjSealList, needQj, needQys]);
-    /** 获取taskId */
-    var getTaskId = function (id, index) {
-        handleRef.current.setTemplateData({
-            taskId: id,
-        }, index);
-    };
     /** 指定签署位置 */
     var checkSealFn = function () {
         // 已勾选的附件中存在attachId为空的标识
@@ -424,11 +418,11 @@ var Sinatures = function (_a) {
                     dataIndex: 'compareAttachId',
                     width: 150,
                     render: function (text, record, index) {
-                        return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request, getTaskId: getTaskId, isEdit: isEdit })) : ('');
+                        return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request })) : ('');
                     },
                 },
                 {
-                    title: '保存为模版',
+                    title: '保存为模板',
                     key: 'templateAttachId',
                     dataIndex: 'templateAttachId',
                     width: 110,
@@ -763,6 +757,8 @@ var Sinatures = function (_a) {
         needQj: needQj,
         needQys: needQys,
         showContranctNum: showContranctNum,
+        request: request,
+        needSaveTemplate: NEED_SAVE_TEMPLATE.includes("" + flowId),
     };
     return (React.createElement(React.Fragment, null, isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: 'max-content' } })) : (React.createElement(DetailTable, __assign({}, detail)))));
 };

package/package.json

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