ztxkui 3.1.5 → 3.1.6

package/dist/components/Table/table-enhance-cell.js

@@ -56,12 +56,14 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { useContext, useEffect, memo } from 'react';
+import React, { useContext, useEffect, memo, useRef } from 'react';
 import { EditableContext } from './table-enhance-row';
 import { Form, Input, InputNumber, Select, message } from '../../index';
+import { ERROR_TD_CLASSNAME } from './index';
 var TableEnhanceCell = memo(function (_a) {
     var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave"]);
     var form = useContext(EditableContext);
+    var tdRef = useRef();
     useEffect(function () {
         var _a;
         if (dataIndex) {
@@ -112,6 +114,11 @@ var TableEnhanceCell = memo(function (_a) {
             }
         });
     }); };
+    function removeErrorClass() {
+        if (tdRef.current) {
+            tdRef.current.classList.remove(ERROR_TD_CLASSNAME);
+        }
+    }
     /**
      * @description 生成编辑框
      */
@@ -119,6 +126,7 @@ var TableEnhanceCell = memo(function (_a) {
         if (!editableConfig) {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
                 React.createElement(Input, { autoComplete: "new-password", maxLength: 50, onPressEnter: save, onBlur: save, allowClear: true, onChange: function (e) {
+                        removeErrorClass();
                         if (!e.target.value) {
                             e.target.focus();
                         }
@@ -175,7 +183,10 @@ var TableEnhanceCell = memo(function (_a) {
         // 处理各种类型
         if (type === 'select') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
-                React.createElement(Select, __assign({ allowClear: true }, editableProps, { disabled: disabledResult, onChange: save }), Array.isArray(selectData) &&
+                React.createElement(Select, __assign({ allowClear: true }, editableProps, { disabled: disabledResult, onChange: function (value, option) {
+                        removeErrorClass();
+                        save(value);
+                    } }), Array.isArray(selectData) &&
                     selectData.map(function (item) { return (React.createElement(Select.Option, { key: item[selectKeyValue.key] + '', value: item[selectKeyValue === null || selectKeyValue === void 0 ? void 0 : selectKeyValue.key] }, item[selectKeyValue === null || selectKeyValue === void 0 ? void 0 : selectKeyValue.label])); }))));
         }
         else if (type === 'inputNumber') {
@@ -191,11 +202,14 @@ var TableEnhanceCell = memo(function (_a) {
                     }, onFocus: function (e) {
                         var _a;
                         editableProps.onFocus && ((_a = editableProps.onFocus) === null || _a === void 0 ? void 0 : _a.call(editableProps, e));
+                    }, onChange: function () {
+                        removeErrorClass();
                     } }))));
         }
         else if (type === 'textArea') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
                 React.createElement(Input.TextArea, __assign({ autoComplete: "new-password", maxLength: 200, autoSize: { maxRows: 3 } }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, onChange: function (e) {
+                        removeErrorClass();
                         if (!e.target.value) {
                             e.target.focus();
                         }
@@ -204,6 +218,7 @@ var TableEnhanceCell = memo(function (_a) {
         else {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
                 React.createElement(Input, __assign({ autoComplete: "new-password", maxLength: 50 }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, allowClear: true, onChange: function (e) {
+                        removeErrorClass();
                         if (!e.target.value) {
                             e.target.focus();
                         }
@@ -214,6 +229,6 @@ var TableEnhanceCell = memo(function (_a) {
     if (editable) {
         childNode = createEditableDom(editableConfig);
     }
-    return React.createElement("td", __assign({}, restProps), childNode);
+    return (React.createElement("td", __assign({ ref: tdRef }, restProps), childNode));
 });
 export default TableEnhanceCell;

package/dist/components/Table/table.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { TableProps } from 'antd/lib/table';
 import { ColumnsType } from './';
+import { IConfigInfo } from './hooks/useColumns';
 import { ISummaryConfig } from './utils/getSummaryData';
 export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'columns'> {
     /**新增行删除行方法 */
@@ -11,6 +12,8 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     hideDelIcon?: boolean;
     /**是否显示动态表头配置 */
     showColumnDynamic?: boolean;
+    /**动态表头配置，是否缓存，动态列配置如果要缓存得话，必须得使用一个全局唯一得key来标识 */
+    showColumnDynamicKey?: string;
     /**是否显示小计或总计 */
     summaryConfig?: ISummaryConfig[];
     summaryFixed?: boolean;
@@ -25,6 +28,16 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     columns?: ColumnsType<RecordType>;
     /** 是否伸缩列 */
     isResizableColumn?: boolean;
+    /** 表格列配置相关信息 */
+    configInfo?: IConfigInfo;
+    /** 表格组件提供的方法 */
+    tableHandleRef?: React.Ref<{
+        validate: () => Promise<any>;
+        clearErrorClass: (index: number) => void;
+        [prop: string]: any;
+    }>;
+    /** 表格组件名字 */
+    tableName?: string;
 }
 /**
  * TodoList

package/dist/components/Table/table.js

@@ -9,6 +9,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -25,8 +61,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
         to[j] = from[i];
     return to;
 };
-import React, { useCallback, memo, useState, useEffect } from 'react';
+import React, { useCallback, memo, useState, useEffect, useRef, useImperativeHandle, } from 'react';
 import { Table as AntTable } from 'antd';
+import { ERROR_TD_CLASSNAME } from './';
 import TableDynamic from './table-dynamic';
 // import TableSummary from './table-summary';
 import TableEnhanceRow from './table-enhance-row';
@@ -34,6 +71,8 @@ import TableEnhanceCell from './table-enhance-cell';
 import TableResizableTitle from './table-resizable-title';
 import useColumns from './hooks/useColumns';
 import getSummaryData from './utils/getSummaryData';
+import { domFind } from './utils/dom';
+import { tableValidate } from './utils/validate';
 import classNames from 'classnames';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd';
@@ -61,7 +100,8 @@ var components = {
  * 实现可编辑功能
  */
 function Table(props) {
-    var className = props.className, scroll = props.scroll, _a = props.pagination, pagination = _a === void 0 ? false : _a, _b = props.bordered, bordered = _b === void 0 ? true : _b, columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, hideDelIcon = props.hideDelIcon, showColumnDynamic = props.showColumnDynamic, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _c = props.isResizableColumn, isResizableColumn = _c === void 0 ? true : _c, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "hideDelIcon", "showColumnDynamic", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn"]);
+    var _this = this;
+    var className = props.className, scroll = props.scroll, _a = props.pagination, pagination = _a === void 0 ? false : _a, _b = props.bordered, bordered = _b === void 0 ? true : _b, columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, hideDelIcon = props.hideDelIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _c = props.isResizableColumn, isResizableColumn = _c === void 0 ? true : _c, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "hideDelIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName"]);
     // console.log('table render');
     var classes = classNames('zt-table', className);
     var _d = useState(false), dynamicVisible = _d[0], setDynamicVisible = _d[1];
@@ -79,11 +119,13 @@ function Table(props) {
     var _f = useColumns({
         columns: _columns,
         showColumnDynamic: showColumnDynamic,
+        showColumnDynamicKey: showColumnDynamicKey,
         onAddAndDelHandle: onAddAndDelHandle,
         hideAddIcon: hideAddIcon,
         hideDelIcon: hideDelIcon,
         showDynamicHandle: showDynamicHandle,
         onEditableSave: onEditableSave,
+        configInfo: configInfo,
     }), newColumns = _f.newColumns, dynamicColumns = _f.dynamicColumns, setNewColumns = _f.setNewColumns;
     /**
      * @description 保存列配置
@@ -102,27 +144,7 @@ function Table(props) {
             });
             var newColumns_1 = __spreadArray(__spreadArray(__spreadArray([], leftArr_1), dynamicColumns), rightArr_1);
             setColumns(newColumns_1);
-            onDynamicChange &&
-                onDynamicChange(newColumns_1.map(function (item) {
-                    if (item.dataIndex || item.key) {
-                        return {
-                            dataIndex: item.dataIndex,
-                            key: item.key,
-                            hideColumn: item.hideColumn,
-                        };
-                    }
-                    return __assign({}, item);
-                }));
-        }
-    }, [_columns, onDynamicChange]);
-    /**
-     * @description 动态列配置重置功能
-     */
-    var resetDynamicHandle = useCallback(function () {
-        var _initColumns = initColumns || columns;
-        setColumns(_initColumns);
-        onDynamicChange &&
-            onDynamicChange((_initColumns || []).map(function (item) {
+            var catchColumns = newColumns_1.map(function (item) {
                 if (item.dataIndex || item.key) {
                     return {
                         dataIndex: item.dataIndex,
@@ -131,9 +153,55 @@ function Table(props) {
                     };
                 }
                 return __assign({}, item);
-            }));
+            });
+            if (showColumnDynamicKey) {
+                var catchColumnsStr = '{}';
+                try {
+                    catchColumnsStr = JSON.stringify(catchColumns);
+                }
+                catch (err) {
+                    console.log(err);
+                }
+                localStorage.setItem(showColumnDynamicKey, catchColumnsStr);
+            }
+            onDynamicChange && onDynamicChange(catchColumns);
+        }
+    }, [_columns, onDynamicChange, showColumnDynamicKey]);
+    /**
+     * @description 动态列配置重置功能
+     */
+    var resetDynamicHandle = useCallback(function () {
+        var _initColumns = initColumns || columns || [];
+        setColumns(__spreadArray([], _initColumns));
+        var catchColumns = (_initColumns || []).map(function (item) {
+            if (item.dataIndex || item.key) {
+                return {
+                    dataIndex: item.dataIndex,
+                    key: item.key,
+                    hideColumn: item.hideColumn,
+                };
+            }
+            return __assign({}, item);
+        });
+        if (showColumnDynamicKey) {
+            var catchColumnsStr = '{}';
+            try {
+                catchColumnsStr = JSON.stringify(catchColumns);
+            }
+            catch (err) {
+                console.log(err);
+            }
+            localStorage.setItem(showColumnDynamicKey, catchColumnsStr);
+        }
+        onDynamicChange && onDynamicChange(catchColumns);
         hideDynamicHandle();
-    }, [initColumns, columns, hideDynamicHandle, onDynamicChange]);
+    }, [
+        initColumns,
+        columns,
+        hideDynamicHandle,
+        onDynamicChange,
+        showColumnDynamicKey,
+    ]);
     /**
      * @description 切换行位置
      */
@@ -170,7 +238,68 @@ function Table(props) {
             cell: TableResizableTitle,
         };
     }
-    return (React.createElement("div", { style: { position: 'relative', overflow: 'hidden' } },
+    /**
+     * 表格暴露方法给外部使用
+     */
+    var tableRef = useRef();
+    function getCurrentTable() {
+        var _a;
+        // 获取表格元素
+        var tableContent = domFind(tableRef.current, '.ant-table-content');
+        var tableBody = domFind(tableContent, '.ant-table-tbody');
+        var tr = tableBody === null || tableBody === void 0 ? void 0 : tableBody.children;
+        var arrTr = Array.prototype.slice.call(tr);
+        var resultTr = ((_a = arrTr === null || arrTr === void 0 ? void 0 : arrTr.filter) === null || _a === void 0 ? void 0 : _a.call(arrTr, function (item) { return item.className.includes('ant-table-row'); })) || [];
+        return { tableBody: tableBody, resultTr: resultTr };
+    }
+    function clearErrorClass(index) {
+        try {
+            var resultTr = getCurrentTable().resultTr;
+            if (typeof index === 'number') {
+                var tds = resultTr[index].querySelectorAll('td');
+                for (var i = 0; i < tds.length; i++) {
+                    tds[i].classList.remove(ERROR_TD_CLASSNAME);
+                }
+            }
+            else {
+                for (var i = 0; i < resultTr.length; i++) {
+                    var tds = resultTr[i].querySelectorAll('td');
+                    for (var j = 0; j < tds.length; j++) {
+                        tds[j].classList.remove(ERROR_TD_CLASSNAME);
+                    }
+                }
+            }
+        }
+        catch (err) {
+            console.log(err);
+        }
+    }
+    useImperativeHandle(tableHandleRef, function () { return ({
+        /** 错误提示 */
+        validate: function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        clearErrorClass();
+                        return [4 /*yield*/, tableValidate(dataSource, mergeColumns, {
+                                getCurrentTable: getCurrentTable,
+                                rowSelection: props.rowSelection,
+                                tableName: tableName,
+                            })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); },
+        /** 获取当前表格 */
+        getCurrentTable: function () {
+            return getCurrentTable();
+        },
+        /** 移除错误样式 */
+        clearErrorClass: clearErrorClass,
+    }); });
+    return (React.createElement("div", { style: { position: 'relative', overflow: 'hidden' }, ref: tableRef },
         React.createElement(DndProvider, { backend: HTML5Backend, context: window },
             React.createElement(AntTable, __assign({ className: classes, bordered: bordered, pagination: pagination, scroll: scroll ? scroll : _scroll, columns: mergeColumns, dataSource: dataSource, components: onMoveRow || onEditableSave
                     ? components

package/dist/components/Table/utils/dom.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @author 陈亚雄
+ * @description dom操作
+ */
+export declare function domFind(el: any, selector: any): any;
+export declare function domFindAll(el: any, selector: any): any;
+export declare function domParentsUntil(el: any, selector: any): any;

package/dist/components/Table/utils/dom.js

@@ -0,0 +1,24 @@
+/**
+ * @author 陈亚雄
+ * @description dom操作
+ */
+export function domFind(el, selector) {
+    return el.querySelector(selector);
+}
+export function domFindAll(el, selector) {
+    return el.querySelectorAll(selector);
+}
+export function domParentsUntil(el, selector) {
+    var matchesSelector = el.matches ||
+        el.webkitMatchesSelector ||
+        el.mozMatchesSelector ||
+        el.msMatchesSelector;
+    el = el.parentElement;
+    while (el) {
+        if (matchesSelector.call(el, selector)) {
+            return el;
+        }
+        el = el.parentElement;
+    }
+    return null;
+}

package/dist/components/Table/utils/validate.d.ts

@@ -0,0 +1 @@
+export declare function tableValidate(dataSource: any, mergeColumns: any, restParams: any): Promise<never>;

package/dist/components/Table/utils/validate.js

@@ -0,0 +1,151 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+/**
+ * @author 陈亚雄
+ * @description 表格验证逻辑
+ */
+import { ERROR_TD_CLASSNAME } from '../index';
+export function tableValidate(dataSource, mergeColumns, restParams) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    return __awaiter(this, void 0, void 0, function () {
+        var getCurrentTable, rowSelection, tableName, requiredFileds, resultTr, i, item, j, _o, dataIndex, title, validate, index, value, err_1, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd;
+        return __generator(this, function (_p) {
+            switch (_p.label) {
+                case 0:
+                    getCurrentTable = restParams.getCurrentTable, rowSelection = restParams.rowSelection, tableName = restParams.tableName;
+                    if (!Array.isArray(dataSource) || dataSource.length === 0) {
+                        console.info('没有数据，无需验证!');
+                        return [2 /*return*/];
+                    }
+                    if (!Array.isArray(mergeColumns)) {
+                        console.info('columns 不是数组!');
+                        return [2 /*return*/];
+                    }
+                    requiredFileds = [];
+                    if (Array.isArray(mergeColumns)) {
+                        mergeColumns.forEach(function (column, index) {
+                            if (column.validate) {
+                                requiredFileds.push({
+                                    dataIndex: column.validate.dataIndex || column.dataIndex,
+                                    title: column.validate.title || column.title,
+                                    validate: column.validate.validate,
+                                    index: index + (rowSelection ? 1 : 0),
+                                });
+                            }
+                        });
+                    }
+                    resultTr = getCurrentTable().resultTr;
+                    i = 0;
+                    _p.label = 1;
+                case 1:
+                    if (!(i < dataSource.length)) return [3 /*break*/, 14];
+                    item = dataSource[i];
+                    j = 0;
+                    _p.label = 2;
+                case 2:
+                    if (!(j < requiredFileds.length)) return [3 /*break*/, 13];
+                    _o = requiredFileds[j], dataIndex = _o.dataIndex, title = _o.title, validate = _o.validate, index = _o.index;
+                    if (!dataIndex) {
+                        return [3 /*break*/, 13];
+                    }
+                    value = item[dataIndex];
+                    if (!validate) return [3 /*break*/, 10];
+                    if (!(typeof validate === 'function')) return [3 /*break*/, 7];
+                    _p.label = 3;
+                case 3:
+                    _p.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, validate(value, item, i + 1, title)];
+                case 4:
+                    _p.sent();
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_1 = _p.sent();
+                    errorTr = resultTr[i];
+                    errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
+                    errorTd = typeof index === 'number' ? errorTds[index] : null;
+                    (_b = (_a = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _a === void 0 ? void 0 : _a.add) === null || _b === void 0 ? void 0 : _b.call(_a, ERROR_TD_CLASSNAME);
+                    (_c = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _c === void 0 ? void 0 : _c.call(errorTd);
+                    return [2 /*return*/, Promise.reject(err_1)];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    if (!!((_e = (_d = validate) === null || _d === void 0 ? void 0 : _d.pattern) === null || _e === void 0 ? void 0 : _e.test(value))) return [3 /*break*/, 9];
+                    errorTr = resultTr[i];
+                    errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
+                    errorTd = typeof index === 'number' ? errorTds[index] : null;
+                    (_g = (_f = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _f === void 0 ? void 0 : _f.add) === null || _g === void 0 ? void 0 : _g.call(_f, ERROR_TD_CLASSNAME);
+                    (_h = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _h === void 0 ? void 0 : _h.call(errorTd);
+                    return [4 /*yield*/, Promise.reject({
+                            errorFields: [
+                                {
+                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C" + title + " " + (((_j = validate) === null || _j === void 0 ? void 0 : _j.message) || '填写错误!'),
+                                },
+                            ],
+                        })];
+                case 8:
+                    _p.sent();
+                    _p.label = 9;
+                case 9: return [3 /*break*/, 12];
+                case 10:
+                    if (!(value === '' || value == null)) return [3 /*break*/, 12];
+                    errorTr = resultTr[i];
+                    errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
+                    errorTd = typeof index === 'number' ? errorTds[index] : null;
+                    (_l = (_k = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _k === void 0 ? void 0 : _k.add) === null || _l === void 0 ? void 0 : _l.call(_k, ERROR_TD_CLASSNAME);
+                    (_m = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _m === void 0 ? void 0 : _m.call(errorTd);
+                    return [4 /*yield*/, Promise.reject({
+                            errorFields: [
+                                {
+                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C" + title + "\u4E3A\u7A7A!",
+                                    rowIndex: i,
+                                    colIndex: index,
+                                },
+                            ],
+                        })];
+                case 11:
+                    _p.sent();
+                    _p.label = 12;
+                case 12:
+                    j++;
+                    return [3 /*break*/, 2];
+                case 13:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 14: return [2 /*return*/];
+            }
+        });
+    });
+}

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

@@ -10,8 +10,6 @@ interface IProps {
     token: string;
     index: number;
     queryCompareTaskUrl?: string;
-    downloadCompareFileUrl?: string;
-    taskId: any;
     request?: any;
 }
 declare const CompareResult: React.FC<IProps>;

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

@@ -5,30 +5,28 @@
 import React from 'react';
 // redux
 // ztxkui公共组件
-import { Button } from '../../../../index';
+import { Button, message } from '../../../../index';
+import { previewFile } from '../utils';
 // 路由配置
 // store
 // 自定义组件
 import AttachOperation from './AttachOperation';
 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, taskId = _a.taskId, queryCompareTaskUrl = _a.queryCompareTaskUrl, downloadCompareFileUrl = _a.downloadCompareFileUrl, request = _a.request;
+    var record = _a.record, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, index = _a.index, queryCompareTaskUrl = _a.queryCompareTaskUrl, request = _a.request;
     var onClickHandle = function () {
         console.log('查看比对结果', index, record);
-        request({
-            url: queryCompareTaskUrl + "/" + taskId,
-            method: 'GET',
-        }).then(function (res) {
-            if (res.status === 200 &&
-                res.data.code === 200 &&
-                res.data.success === true) {
-                request({
-                    url: downloadCompareFileUrl + "/" + taskId,
-                    method: 'GET',
-                }).then(function (res) {
-                    //TODO
-                });
-            }
-        });
+        var task_id = record.taskId;
+        if (task_id) {
+            request(queryCompareTaskUrl + "/" + task_id, '', 'GET').then(function (res) {
+                if (res.code === 200) {
+                    var url = ZT_API_BASEURL + "/zmdms-resource/seal/download-compare-file/" + task_id + "?Zmdms-Auth=" + token + "&fullfilename=1.zip";
+                    previewFile(ZT_FILE_BASEURL, url);
+                }
+            });
+        }
+        else {
+            message.info('请先点击合同比对获取taskId');
+        }
     };
     return (React.createElement("div", null,
         React.createElement("div", { className: "signatures-template" },

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

@@ -10,7 +10,7 @@ var ElectronicSeal = function (_a) {
     var electronicList = _a.electronicList, value = _a.value, onChange = _a.onChange;
     return (React.createElement(Checkbox.Group, { defaultValue: value, onChange: onChange, className: "flex-checkbox-group" }, Array.isArray(electronicList) &&
         electronicList.map(function (item) {
-            return (React.createElement(Checkbox, { key: item.name, value: item.name }, item.name));
+            return (React.createElement(Checkbox, { key: item.id, value: item.id }, item.name));
         })));
 };
 export default ElectronicSeal;

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

@@ -5,7 +5,7 @@
 import React, { useEffect } from 'react';
 // redux
 // ztxkui公共组件
-import { Form, Input, InputNumber, SearchContainer, Radio, } from '../../../../index';
+import { Form, Input, InputNumber, SearchContainer, Radio, Button, } from '../../../../index';
 // 路由配置
 // store
 // 自定义组件
@@ -35,6 +35,7 @@ var QunjSeal = function (_a) {
                     React.createElement(Input, { size: "small", bordered: false })),
                 React.createElement(Item, { name: "contractNum", label: "\u5408\u540C\u4EFD\u6570", noBorder: true, width: "all" },
                     React.createElement(InputNumber, { size: "small", bordered: false, min: 0 })),
+                React.createElement(Button, { type: "primary", size: "small", style: { marginLeft: '6px' } }, "\u67E5\u8BE2\u7528\u5370\u72B6\u6001"),
                 React.createElement(Item, { name: "sealMode", label: "", noBorder: true, width: "all" },
                     React.createElement(Radio.Group, { style: { padding: '0 6px' } },
                         React.createElement(Radio, { value: "1" }, "\u5185\u90E8\u7528\u5370"),

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

@@ -12,7 +12,7 @@ interface IProps {
     /** 点击客户样板 */
     openCustomerModalHandle?: any;
     compareTaskUrl?: string;
-    getTaskId: (id: any) => void;
+    getTaskId: (id: any, index: number) => void;
     request?: any;
 }
 declare const TemplateAttach: React.FC<IProps>;