ztxkui 3.8.2 → 3.8.3

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/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.2",
+  "version": "3.8.3",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",