ztxkui 3.6.7 → 3.6.8

package/dist/DemoCom/PrintContainerDemo.js

@@ -29,7 +29,7 @@ function request(options) {
     return axios({
         baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000',
         url: options.url,
-        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MjUzNjc4Niwib3JnX25hbWUiOm51bGwsImp0aSI6IjBjY2VlZTI0LWQ0OWItNDdjZS1iZTUxLWRkN2MzYjdlNjRlMiIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.hSebS1p4veDHvxHJKo5WIyHRnaw6WrP0zCf0mt3_HyA' }, options.headers),
+        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MjY4ODc1Niwib3JnX25hbWUiOm51bGwsImp0aSI6IjU0ZTM0ZmRkLTZlY2UtNDYwZS05ZWViLWE0MTYyZjIzNGE3MSIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.YCwZpMb5Pn73o7mSo2R7pqFPa1kX5FCsY7jbAAJng9s' }, options.headers),
         method: options.method,
         data: options.data,
         params: options.params,
@@ -91,7 +91,7 @@ var PrintContainerDemo = function () {
     var _c = useState(''), base64Img = _c[0], setBase64Img = _c[1];
     useEffect(function () {
         var xhr = new XMLHttpRequest();
-        var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MjUzNjc4Niwib3JnX25hbWUiOm51bGwsImp0aSI6IjBjY2VlZTI0LWQ0OWItNDdjZS1iZTUxLWRkN2MzYjdlNjRlMiIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.hSebS1p4veDHvxHJKo5WIyHRnaw6WrP0zCf0mt3_HyA';
+        var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MjY4ODc1Niwib3JnX25hbWUiOm51bGwsImp0aSI6IjU0ZTM0ZmRkLTZlY2UtNDYwZS05ZWViLWE0MTYyZjIzNGE3MSIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.YCwZpMb5Pn73o7mSo2R7pqFPa1kX5FCsY7jbAAJng9s';
         xhr.open('GET', "http://192.168.0.83:8000/api/zmdms-resource/oss/endpoint/download-file/1559472632642387969?Zmdms-Auth=bearer " + token, true);
         xhr.responseType = 'blob';
         xhr.onload = function () {
@@ -103,7 +103,7 @@ var PrintContainerDemo = function () {
         };
         xhr.send();
     }, []);
-    return (React.createElement(PrintContainer, { isAddExportPage: false, loading: loading, request: request, deptId: "1295909488001540097", flowId: "scm_print_tdtd", fileId: "1551733945007517697", 
+    return (React.createElement(PrintContainer, { isAddExportPage: false, loading: loading, request: request, deptId: "1414852847035002881", flowId: "scm_order_contract_cght", fileId: "1551733945007517697", 
         // keywordList={keywordList}
         imgWaterBg: water, showPrintMessage: true, 
         // onPrintBeforeCallback={() => {

package/dist/DemoCom/TableDemo.js

@@ -765,6 +765,19 @@ var TableDemo = function () {
                     } }));
             },
         },
+        {
+            title: '编辑字段5',
+            width: 220,
+            dataIndex: 'test5',
+            key: 'test5',
+        },
+        {
+            title: '编辑字段6',
+            width: 220,
+            dataIndex: 'test6',
+            key: 'test6',
+            fixed: 'right',
+        },
         {
             title: '操作',
             width: 300,

package/dist/components/PrintContainer/print-container.js

@@ -590,6 +590,9 @@ var PrintContainer = function (_a) {
                         formData.append("sealIdList[" + i + "]", sealId);
                     });
                 }
+                if (deptId) {
+                    formData.append('deptId', deptId);
+                }
                 request({
                     url: '/api/zmdms-resource/seal/confirm-seal-position',
                     method: 'POST',
@@ -642,6 +645,7 @@ var PrintContainer = function (_a) {
             data: {
                 contractId: currentContractId,
                 sealIdList: _sealIdList,
+                deptId: deptId,
                 needWatermark: needWatermark,
             },
             heaers: {

package/dist/components/Table/hooks/useColumns.js

@@ -20,7 +20,14 @@ import TableAddDelColumn from '../table-adddel-column';
 // 获取表格columns完整数据
 export var getTableLayoutFullData = function (columns, tableLayout) {
     if (Array.isArray(tableLayout) && tableLayout.length > 0) {
-        var newColumns = tableLayout.map(function (item) {
+        var preColumns_1 = [];
+        var middleColumns_1 = [];
+        var afterColumns_1 = [];
+        // 这里存在，业务可能会修改原始columns数据，所以按照columns数据，将本地存储数据换新
+        // 1. 如果本地存储中有，原始columns中没有，那么删除掉本地存储中的
+        // 2. 将数据 按照 原始数据中的 是否固定 固定位置来分组。前 中 后三组
+        // 3. 缓存的数据只用来合并中间的并且能在原始columns中找到的内容
+        tableLayout.forEach(function (item) {
             if ((item === null || item === void 0 ? void 0 : item.key) || (item === null || item === void 0 ? void 0 : item.dataIndex)) {
                 var result = columns.find(function (column) {
                     if (column.key) {
@@ -31,12 +38,34 @@ export var getTableLayoutFullData = function (columns, tableLayout) {
                     }
                     return false;
                 });
-                return __assign(__assign({}, result), item);
+                // 如果能再原始数据中找到对应的值
+                if (result && !result.fixed) {
+                    middleColumns_1.push(__assign(__assign({}, result), item));
+                }
+                // 如果没有在原始数据中找到对应的值，那说明这个应该删除，不应该添加进去
+            }
+            // 如果没有key 或者dataIndex 则说明该值不应该存在
+            // return {
+            //   ...item,
+            // };
+        });
+        // 在按照规则，将原始columns中可能新增的数据，做一下处理
+        // 1. 取出所有定位元素，将定位元素添加到对应的组内
+        // 2. 找到所有没有定位的元素，并且tableLayout中中间元素中不存在的元素
+        columns
+            .filter(function (column) { return column.fixed; })
+            .forEach(function (column) {
+            if (column.fixed === 'left') {
+                preColumns_1.push(__assign({}, column));
             }
-            return __assign({}, item);
+            else if (column.fixed === 'right') {
+                afterColumns_1.push(__assign({}, column));
+            }
+        });
+        var newAddColumns = columns.filter(function (column) {
+            return !column.fixed && !middleColumns_1.find(function (item) { return item.key === column.key; });
         });
-        var newAddColumns = columns.filter(function (column) { return !tableLayout.find(function (item) { return item.key === column.key; }); });
-        return __spreadArray(__spreadArray([], newColumns), newAddColumns);
+        return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], preColumns_1), middleColumns_1), newAddColumns), afterColumns_1);
     }
     return columns;
 };

package/dist/components/Table/table-dynamic.js

@@ -75,7 +75,6 @@ function TableDynamic(props) {
     var onDynamicChangeHandle = function (checkedValue) {
         setCheckedValues(checkedValue);
     };
-    console.log(visible);
     return (React.createElement(Drawer, { placement: "right", getContainer: false, closable: false, maskClosable: false, 
         // style={{ position: 'absolute' }}
         visible: visible, className: "zt-table__dynamic", title: React.createElement("div", null,

package/dist/components/Table/table.js

@@ -144,14 +144,24 @@ function Table(props) {
                     rightArr_1.push(column);
                 }
             });
-            var newColumns_1 = __spreadArray(__spreadArray(__spreadArray([], leftArr_1), dynamicColumns), rightArr_1);
-            setColumns(newColumns_1);
-            var catchColumns = newColumns_1.map(function (item) {
+            // 记录width信息
+            var _newColumns = __spreadArray(__spreadArray(__spreadArray([], leftArr_1), dynamicColumns), rightArr_1);
+            // 同步width
+            _newColumns = _newColumns.map(function (item) {
+                var column = newColumns.find(function (column) {
+                    return column.dataIndex === item.dataIndex || column.key === item.key;
+                });
+                return column && column.width
+                    ? __assign(__assign({}, item), { width: column.width }) : item;
+            });
+            setColumns(_newColumns);
+            var catchColumns = _newColumns.map(function (item) {
                 if (item.dataIndex || item.key) {
                     return {
                         dataIndex: item.dataIndex,
                         key: item.key,
                         hideColumn: item.hideColumn,
+                        width: item.width,
                     };
                 }
                 return __assign({}, item);
@@ -168,7 +178,7 @@ function Table(props) {
             }
             onDynamicChange && onDynamicChange(catchColumns);
         }
-    }, [_columns, onDynamicChange, showColumnDynamicKey]);
+    }, [_columns, newColumns, onDynamicChange, showColumnDynamicKey]);
     /**
      * @description 动态列配置重置功能
      */
@@ -181,6 +191,7 @@ function Table(props) {
                     dataIndex: item.dataIndex,
                     key: item.key,
                     hideColumn: item.hideColumn,
+                    width: item.width,
                 };
             }
             return __assign({}, item);
@@ -226,6 +237,42 @@ function Table(props) {
             var size = _a.size;
             var _newColumns = __spreadArray([], (newColumns || []));
             _newColumns[index] = __assign(__assign({}, _newColumns[index]), { width: size.width });
+            var leftArr = [];
+            var rightArr = [];
+            if (Array.isArray(_columns)) {
+                _columns.forEach(function (column) {
+                    if (column.fixed === 'left') {
+                        leftArr.push(column);
+                    }
+                    if (column.fixed === 'right') {
+                        rightArr.push(column);
+                    }
+                });
+            }
+            var catchColumns = __spreadArray(__spreadArray(__spreadArray([], leftArr), dynamicColumns), rightArr).map(function (item) {
+                var column = _newColumns.find(function (column) {
+                    return column.dataIndex === item.dataIndex || column.key === item.key;
+                });
+                if (item.dataIndex || item.key) {
+                    return {
+                        dataIndex: item.dataIndex,
+                        key: item.key,
+                        hideColumn: item.hideColumn,
+                        width: column && column.width ? column.width : item.width,
+                    };
+                }
+                return __assign({}, item);
+            });
+            if (showColumnDynamicKey) {
+                var catchColumnsStr = '{}';
+                try {
+                    catchColumnsStr = JSON.stringify(catchColumns);
+                }
+                catch (err) {
+                    console.log(err);
+                }
+                localStorage.setItem(showColumnDynamicKey, catchColumnsStr);
+            }
             setNewColumns(_newColumns);
         };
     };

package/package.json

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