ztxkui 4.3.43 → 4.3.45

package/dist/Demo.js

@@ -1,5 +1,16 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import EnhanceSelect from 'components/EnhanceSelect';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useMemo, useRef } from 'react';
 import { stringify } from 'qs';
 import { Link } from 'react-router-dom';
 import { token } from './constants';
@@ -21,13 +32,15 @@ function Demo() {
     var _e = useState(), value2 = _e[0], setValue2 = _e[1];
     var _f = useState(), value3 = _f[0], setValue3 = _f[1];
     var _g = useState('0'), selectVal = _g[0], setSelectVal = _g[1];
+    var _h = useState(''), value4 = _h[0], setValue4 = _h[1];
+    var _j = useState(''), value5 = _j[0], setValue5 = _j[1];
     var params = useState({
         tenantId: '000000',
         isCreateUser: 0,
     })[0];
-    var _h = useState(JSON.stringify({
+    var _k = useState(JSON.stringify({
         status: 50,
-    })), params1 = _h[0], setParams1 = _h[1];
+    })), params1 = _k[0], setParams1 = _k[1];
     // 模拟接口请求
     useEffect(function () {
         var timeoutId = setTimeout(function () {
@@ -63,6 +76,24 @@ function Demo() {
             }
         };
     }, []);
+    var byChangeRef = useRef(false);
+    var preValue = useRef('');
+    var onChangeHandle = function (value, option, fullData) {
+        byChangeRef.current = true;
+    };
+    var newParams = useMemo(function () {
+        var byChange = byChangeRef.current;
+        byChangeRef.current = false;
+        try {
+            if (!byChange) {
+                preValue.current = value4 ? value4 + '' : '';
+            }
+            return JSON.stringify(__assign(__assign({}, params), { id: preValue.current }));
+        }
+        catch (err) {
+            return JSON.stringify(params);
+        }
+    }, [params, value4]);
     return (React.createElement("div", { style: { height: 2000 } },
         React.createElement(Link, { to: "/test" }, "test"),
         React.createElement("div", null,
@@ -108,19 +139,24 @@ function Demo() {
                 console.log(value, value3);
             } }, "\u83B7\u53D6\u6570\u636E"),
         React.createElement("p", null, "\u8FDC\u7A0B\u641C\u7D22"),
-        React.createElement(EnhanceSelect, { style: selectStyle, 
+        React.createElement("input", { value: value5, onChange: function (e) { return setValue5(e.target.value); } }),
+        React.createElement("button", { onClick: function () {
+                setValue4(value5);
+            } }, "\u8BBE\u7F6E\u6570\u636E"),
+        React.createElement(EnhanceSelect, { value: value4, 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
-            isRemoteSearchDataKey: false, dataKey: "id", titleKey: "empName", value: value, 
+            isRemoteSearchDataKey: false, dataKey: "id", titleKey: "empName", 
             // showAll
             // isPaste
             onChange: function (value, option, fullData) {
                 console.log(value);
                 setValue(value);
-            }, params: JSON.stringify(params), 
+            }, params: newParams, 
             // value={value}
-            mode: "multiple", isPage: true }),
+            // mode="multiple"
+            isPage: 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, isPaste: true, mode: "multiple", isHandAddItem: true, value: value3, onChange: function (value, option, fullData) {
                 console.log(value, fullData);

package/dist/UI/Form/index.js

@@ -89,7 +89,22 @@ function Home() {
             {
                 name: 'test22',
                 label: '测试22',
-                dependencies: ['test1'],
+                isDisplay: function (form) {
+                    if (form.getFieldsValue('test1') === '1') {
+                        return true;
+                    }
+                },
+                shouldUpdateNames: ['test1'],
+                disabled: true,
+                render: function (itemProps, formInstance) {
+                    return React.createElement(Input, __assign({}, itemProps, { allowClear: true }));
+                },
+            },
+            {
+                name: 'test221',
+                label: '测试221',
+                isDisplay: function (form) { },
+                shouldUpdateNames: ['test1'],
                 disabled: true,
                 render: function (itemProps, formInstance) {
                     return React.createElement(Input, __assign({}, itemProps, { allowClear: true }));

package/dist/components/EmptyText/empty-text.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+export interface IProps {
+    children?: string;
+    /** 是否需要包裹容器（默认不需要，如果需要会包裹一个div） */
+    isContainer?: boolean;
+}
+declare function EmptyText(props: IProps): JSX.Element;
+export default EmptyText;

package/dist/components/EmptyText/empty-text.js

@@ -0,0 +1,13 @@
+import React from 'react';
+var isEmpty = function (text) {
+    return (text == null ||
+        text === '' ||
+        text === 'null' ||
+        text === 'undefined' ||
+        isNaN(text));
+};
+function EmptyText(props) {
+    var children = props.children, isContainer = props.isContainer;
+    return isContainer ? (React.createElement("div", null, isEmpty(children) ? '— —' : children)) : (React.createElement(React.Fragment, null, isEmpty(children) ? '— —' : children));
+}
+export default EmptyText;

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

@@ -0,0 +1,2 @@
+import EmptyText from './empty-text';
+export default EmptyText;

package/dist/components/EmptyText/index.js

@@ -0,0 +1,2 @@
+import EmptyText from './empty-text';
+export default EmptyText;

package/dist/components/EnhanceSelect/index.js

@@ -756,9 +756,15 @@ function EnhanceSelect(_a) {
                     console.error("\u9047\u5230\u4E86\u6570\u7EC4\u4E2D\u5B58\u5728\u7A7A\u503C\u5F97\u60C5\u51B5\uFF0C\u8BF7\u68C0\u67E5\u6570\u636E\u51C6\u786E\u6027!\u5B58\u5728\u95EE\u9898\u5F97\u6570\u636E \u53EF\u80FD\u5728defaultList\u4E2D " + url + "==" + dataKey + "==" + titleKey);
                     return;
                 }
-                // 如果item是手动输入的 不做任何处理
+                // 如果item是手动输入的 并且名字没有重复的 不做任何处理
                 if (item.__is_hand_add) {
-                    resultData.push(item);
+                    var result = resultData.findIndex(function (resultItem) {
+                        return resultItem && item && resultItem[titleKey] === item[titleKey];
+                    });
+                    if (result === -1) {
+                        resultData.push(item);
+                    }
+                    return;
                 }
                 // 如果源数组中找到了该条数据，那么不添加
                 // 否则添加

package/dist/components/ProForm/hooks.js

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { useMemo, useState, useCallback, useEffect } from 'react';
+import { catchHandle } from '../utils/fetch';
 /**
  * 获取动态列配置相关信息
  */
@@ -130,6 +131,18 @@ export function setDynamicKey(dynamicStorageKey, value) {
     obj[dynamicStorageKey] = value;
     localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
+    // 2023-11-29
+    // 设置表单动态列配置相关信息
+    catchHandle({
+        customKey: LOCALSTORAGE_KEY,
+        customValue: JSON.stringify(obj),
+        mark: '新表单动态列配置缓存数据',
+    }, 'form_id');
+    catchHandle({
+        customKey: LOCALSTORAGE_LRU_KEY,
+        customValue: JSON.stringify(lruKeys),
+        mark: '新表单动态列配置缓存LRUKey数据',
+    }, 'form_lru_id');
 }
 export function useDynamic(showDynamic, showDynamicKey, items) {
     var initDynamicList = useMemo(function () {

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

@@ -17,7 +17,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import React, { useCallback, useState, useRef, useMemo } from 'react';
 import { unstable_batchedUpdates } from 'react-dom';
 import Button from '../../Button';
-import { Popconfirm } from '../../../index';
+import { Popconfirm, EmptyText } from '../../../index';
 import { PicRightOutlined, MinusSquareOutlined } from '@ant-design/icons';
 import TableAddDelColumn from '../table-adddel-column';
 import TableHeadTooltip from '../table-headTooltip';
@@ -27,6 +27,7 @@ import FilterDropdown from '../components/FilterDropdown';
 import FillDown from '../components/FillDown';
 import { SearchOutlined } from '@ant-design/icons';
 import { filterHandle } from '../utils/filterHandle';
+import { catchHandle } from '../../utils/fetch';
 // 获取表格columns完整数据
 export var getTableLayoutFullData = function (columns, tableLayout) {
     // const columns = _columns.map((item) => {
@@ -202,6 +203,18 @@ export function setDynamicKey(dynamicStorageKey, value) {
     obj[dynamicStorageKey] = value;
     localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
+    // 2023-11-29
+    // 设置表格动态列配置相关信息
+    catchHandle({
+        customKey: LOCALSTORAGE_KEY,
+        customValue: JSON.stringify(obj),
+        mark: '表格动态列配置缓存数据',
+    }, 'table_id');
+    catchHandle({
+        customKey: LOCALSTORAGE_LRU_KEY,
+        customValue: JSON.stringify(lruKeys),
+        mark: '表格动态列配置缓存LRUKey数据',
+    }, 'table_lru_id');
 }
 function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig) {
     var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef, expandableChildrenColumnName = basicConfig.expandableChildrenColumnName, upDateColumnsRef = basicConfig.upDateColumnsRef, setUpDateColumnsRef = basicConfig.setUpDateColumnsRef, isUpDateColumnsRef = basicConfig.isUpDateColumnsRef, setIsUpDateColumnsRef = basicConfig.setIsUpDateColumnsRef;
@@ -375,9 +388,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         }
         // 添加render字段
         if (!_column.render) {
-            _column.render = function (text, record, index) {
-                return text == null || text === '' ? '— —' : text;
-            };
+            _column.render = function (text, record, index) { return React.createElement(EmptyText, null, text); };
         }
         // 添加表头提示信息
         if (_column.headTooltip) {

package/dist/components/business/SearchContainer/hooks/useDynamic.js

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import React, { useEffect, useState } from 'react';
+import { catchHandle } from '../../../utils/fetch';
 // 搜索表单存储位置信息key
 var LOCALSTORAGE_KEY = 'ztui_dynamic_list_key';
 // 搜索表单LRU排序规则key
@@ -63,6 +64,18 @@ export function setDynamicKey(dynamicStorageKey, value) {
     obj[dynamicStorageKey] = value;
     localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(obj));
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
+    // 2023-11-29
+    // 设置表单动态列配置相关信息
+    catchHandle({
+        customKey: LOCALSTORAGE_KEY,
+        customValue: JSON.stringify(obj),
+        mark: '表单动态列配置缓存数据',
+    }, 'list_id');
+    catchHandle({
+        customKey: LOCALSTORAGE_LRU_KEY,
+        customValue: JSON.stringify(lruKeys),
+        mark: '表单动态列配置缓存LRUKey数据',
+    }, 'list_lru_id');
 }
 export function getNewChildren(children) {
     var newChildren = [];

package/dist/components/utils/fetch.d.ts

@@ -0,0 +1,10 @@
+export declare function customFetch(url: any, options: any): Promise<unknown>;
+export declare function catchHandle(data: {
+    customKey: string;
+    customValue: string;
+    mark: string;
+}, idKey?: string): void;
+export declare function parseJwt(token: any): {
+    header: any;
+    payload: any;
+};

package/dist/components/utils/fetch.js

@@ -0,0 +1,119 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { getToken } from 'ztxkutils/dist/authority';
+export function customFetch(url, options) {
+    // 检查原生 fetch 是否存在
+    if (window.fetch) {
+        return fetch(url, options);
+    }
+    else {
+        // 使用 XMLHttpRequest 来模拟 fetch
+        return new Promise(function (resolve, reject) {
+            var xhr = new XMLHttpRequest();
+            xhr.open(options && options.method ? options.method : 'GET', url);
+            // 设置请求头
+            if (options && options.headers) {
+                Object.keys(options.headers).forEach(function (key) {
+                    xhr.setRequestHeader(key, options.headers[key]);
+                });
+            }
+            xhr.onload = function () {
+                var response = {
+                    ok: xhr.status >= 200 && xhr.status < 300,
+                    status: xhr.status,
+                    statusText: xhr.statusText,
+                    url: xhr.responseURL,
+                    text: function () { return Promise.resolve(xhr.responseText); },
+                    json: function () { return Promise.resolve(JSON.parse(xhr.responseText)); },
+                    blob: function () { return Promise.resolve(new Blob([xhr.response])); },
+                    clone: function () { return response; },
+                    headers: {
+                        get: function (name) { return xhr.getResponseHeader(name); },
+                    },
+                };
+                resolve(response);
+            };
+            xhr.onerror = function () {
+                reject(new TypeError('Network request failed'));
+            };
+            xhr.ontimeout = function () {
+                reject(new TypeError('Network request failed: timeout'));
+            };
+            // 设置请求体
+            if (options && options.body) {
+                xhr.send(options.body);
+            }
+            else {
+                xhr.send();
+            }
+        });
+    }
+}
+// 缓存数据变更、新增
+export function catchHandle(data, idKey) {
+    // const id = window.localStorage.getItem(idKey);
+    var token = getToken();
+    var payload = (parseJwt(token) || {}).payload;
+    // if (id) {
+    //   customFetch('/api/zmdms-user/user-custom/update', {
+    //     method: 'POST',
+    //     body: JSON.stringify({
+    //       id,
+    //       systemCategory: '1',
+    //       userId: payload?.user_id,
+    //       userName: payload?.real_name,
+    //       ...data,
+    //     }),
+    //     headers: {
+    //       'Content-Type': 'application/json',
+    //       'Zmdms-Auth': token,
+    //     },
+    //   });
+    // } else {
+    // 不需要修改
+    customFetch('/api/zmdms-user/user-custom/save', {
+        method: 'POST',
+        body: JSON.stringify(__assign({ systemCategory: '1', userId: payload === null || payload === void 0 ? void 0 : payload.user_id, userName: payload === null || payload === void 0 ? void 0 : payload.real_name }, data)),
+        headers: {
+            'Content-Type': 'application/json',
+            'Zmdms-Auth': token,
+        },
+    });
+    // }
+}
+export function parseJwt(token) {
+    try {
+        var base64UrlDecode = function (str) {
+            // 将 Base64Url 编码转换为 Base64 编码
+            var base64 = str.replace(/-/g, '+').replace(/_/g, '/');
+            // 对 Base64 编码的字符串进行解码
+            var jsonPayload = decodeURIComponent(atob(base64)
+                .split('')
+                .map(function (c) {
+                return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+            })
+                .join(''));
+            return JSON.parse(jsonPayload);
+        };
+        var parts = token.split('.');
+        if (parts.length !== 3) {
+            throw new Error('The token is invalid');
+        }
+        var header = base64UrlDecode(parts[0]);
+        var payload = base64UrlDecode(parts[1]);
+        return { header: header, payload: payload };
+    }
+    catch (error) {
+        console.error('Failed to parse JWT:', error);
+        return null;
+    }
+}

package/dist/index.d.ts

@@ -52,6 +52,7 @@ export { default as CodeQuery } from './components/business/CodeQuery';
 export { default as DgColumns } from './components/business/DgColumns';
 export { default as message } from './components/basic/message';
 export { default as NumberCase } from './components/NumberCase';
+export { default as EmptyText } from './components/EmptyText';
 export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, notification, Slider, Rate, Affix, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/dist/index.js

@@ -180,6 +180,7 @@ export { default as CodeQuery } from './components/business/CodeQuery';
 export { default as DgColumns } from './components/business/DgColumns';
 export { default as message } from './components/basic/message';
 export { default as NumberCase } from './components/NumberCase';
+export { default as EmptyText } from './components/EmptyText';
 export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, notification, Slider, Rate, Affix, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/package.json

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