ztxkui 3.2.5 → 3.2.8

package/dist/DemoCom/BasicDemo.js

@@ -1,7 +1,7 @@
 import InputNumber from 'components/InputNumber';
 import Tag from 'components/Tag';
 import Input from 'components/Input';
-import { FormList, RangePicker, Button, Modal } from '../index';
+import { FormList, RangePicker, Button, Modal, Container } from '../index';
 import { InputNumber as AntInputNumber } from 'antd';
 import GridList from 'components/business/NewList';
 import { useState } from 'react';
@@ -52,7 +52,14 @@ function BasicDemo() {
         dayjs('2022-05-11'),
         dayjs('2022-05-31'),
     ]), rangeValue = _b[0], setRangeValue = _b[1];
-    return (React.createElement(React.Fragment, null,
+    var _c = useState(false), loading = _c[0], setLoading = _c[1];
+    return (React.createElement(Container, { loading: loading },
+        React.createElement(Button, { onClick: function () {
+                setLoading(true);
+                setTimeout(function () {
+                    setLoading(false);
+                }, 5000);
+            } }, "\u52A0\u8F7D"),
         React.createElement("div", null,
             React.createElement(Button, { onClick: function () {
                     Modal.confirm({

package/dist/components/business/Container/container.js

@@ -20,15 +20,32 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Spin } from 'antd';
 import classNames from 'classnames';
 var Container = function (_a) {
     var loading = _a.loading, children = _a.children, className = _a.className, containerRef = _a.containerRef, spinProps = _a.spinProps, restProps = __rest(_a, ["loading", "children", "className", "containerRef", "spinProps"]);
     var classes = classNames('zt-container', className);
+    var _b = useState(1), countdown = _b[0], setCountdown = _b[1];
+    useEffect(function () {
+        if (!loading) {
+            setCountdown(1);
+        }
+    }, [loading]);
+    useEffect(function () {
+        if (!loading) {
+            return;
+        }
+        var timeout = setInterval(function () {
+            setCountdown(function (pre) { return pre + 1; });
+        }, 1000);
+        return function () {
+            timeout && clearInterval(timeout);
+        };
+    }, [loading]);
     return (React.createElement("div", __assign({ className: classes }, restProps, { ref: containerRef }),
         loading && (React.createElement("div", { className: "zt-container__loading" },
-            React.createElement(Spin, __assign({ size: "large", spinning: loading }, spinProps)))),
+            React.createElement(Spin, __assign({ size: "large", spinning: loading, tip: "" + countdown }, spinProps)))),
         children));
 };
 export default Container;

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

@@ -5,9 +5,6 @@
 import React from 'react';
 interface IProps {
     record: any;
-    ZT_API_BASEURL: string;
-    ZT_FILE_BASEURL: string;
-    token: string;
     index: number;
     request?: any;
 }

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

@@ -6,27 +6,28 @@ import React, { useState } from 'react';
 // redux
 // ztxkui公共组件
 import { Button, message } from '../../../../index';
-import { previewFile } from '../utils';
 var CompareResult = function (_a) {
-    var record = _a.record, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, index = _a.index, request = _a.request;
+    var record = _a.record, index = _a.index, request = _a.request;
     // 设置查看比对结果按钮的loading状态
     var _b = useState(false), loading = _b[0], setLoading = _b[1];
     var onClickHandle = function () {
         console.log('查看比对结果', index, record);
         setLoading(true);
         try {
-            var task_id_1 = record.taskId;
-            if (task_id_1) {
+            var task_id = record.taskId;
+            if (task_id) {
                 // 比对任务状态查询
                 request({
-                    url: "/api/zmdms-resource/seal/query-compare-task/" + task_id_1,
+                    url: "/api/zmdms-resource/seal/query-compare-task/" + task_id,
                     method: 'GET',
                 })
                     .then(function (res) {
-                    if (res.status === 200 && res.data.code === 200) {
-                        var url = ZT_API_BASEURL + "/zmdms-resource/seal/download-compare-file/" + task_id_1 + "?Zmdms-Auth=" + token + "&fullfilename=1.zip";
-                        // 比对文件下载
-                        previewFile(ZT_FILE_BASEURL, url);
+                    var _a;
+                    if (res.status === 200 &&
+                        res.data.code === 200 &&
+                        ((_a = res.data.data[0]) === null || _a === void 0 ? void 0 : _a.url)) {
+                        // 比对文件预览
+                        window.open(res.data.data[0].url);
                     }
                     else {
                         message.error(res.data.msg || '出错了');
@@ -38,7 +39,7 @@ var CompareResult = function (_a) {
                 });
             }
             else {
-                message.info('缺少taskId');
+                message.info('请先进行合同比对！');
             }
         }
         catch (err) {

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

@@ -1,9 +1,6 @@
 import React from 'react';
 interface IProps {
     record: any;
-    ZT_API_BASEURL: string;
-    ZT_FILE_BASEURL: string;
-    token: string;
     index: number;
     /** 点击客户样板 */
     openCustomerModalHandle?: any;

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

@@ -8,7 +8,7 @@ import React, { useState } from 'react';
 // ztxkui公共组件
 import { Button } from '../../../../index';
 var TemplateAttach = function (_a) {
-    var record = _a.record, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, openCustomerModalHandle = _a.openCustomerModalHandle, index = _a.index, request = _a.request, getTaskId = _a.getTaskId, isEdit = _a.isEdit;
+    var record = _a.record, openCustomerModalHandle = _a.openCustomerModalHandle, index = _a.index, request = _a.request, getTaskId = _a.getTaskId, isEdit = _a.isEdit;
     // 设置合同比对按钮的loading状态
     var _b = useState(false), loading = _b[0], setLoading = _b[1];
     var onClickHandle = function () {
@@ -51,8 +51,10 @@ var TemplateAttach = function (_a) {
         }
     };
     return (React.createElement("div", null,
+        React.createElement("div", null, record.templateAttachName || ''),
+        React.createElement("div", null, record.templateCrNo || ''),
         React.createElement("div", null,
-            React.createElement(Button, { type: "link", onClick: function () {
+            React.createElement(Button, { type: "link", disabled: !isEdit, onClick: function () {
                     openCustomerModalHandle && openCustomerModalHandle(index);
                 } }, "\u9009\u62E9\u5BA2\u6237\u6837\u677F")),
         React.createElement(Button, { type: "primary", size: "small", disabled: !isEdit, onClick: onClickHandle, loading: loading }, "\u5408\u540C\u6BD4\u5BF9")));

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

@@ -202,7 +202,7 @@ var Sinatures = function (_a) {
             dataIndex: 'templateAttachId',
             width: 220,
             render: function (text, record, index) {
-                return record.attachTypeName === '合同本身' ? (React.createElement(TemplateAttach, { record: record, request: request, ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, token: authToken, index: index, openCustomerModalHandle: openCustomerModalHandle, getTaskId: getTaskId, isEdit: isEdit })) : ('');
+                return record.attachTypeName === '合同本身' ? (React.createElement(TemplateAttach, { record: record, request: request, index: index, openCustomerModalHandle: openCustomerModalHandle, getTaskId: getTaskId, isEdit: isEdit })) : ('');
             },
         },
         {
@@ -211,7 +211,7 @@ var Sinatures = function (_a) {
             dataIndex: 'compareAttachId',
             width: 100,
             render: function (text, record, index) {
-                return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, token: authToken, index: index, request: request })) : ('');
+                return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request })) : ('');
             },
         },
         {

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

@@ -13,6 +13,7 @@ export interface IFileItem {
     compareAttachSize?: string;
     isWatermark?: boolean;
     isElectronicSeal?: boolean;
+    templateCrNo?: string;
     [prop: string]: any;
 }
 export interface IQunjProps {

package/package.json

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