zmdms-webui 2.7.8 → 2.7.9

package/dist/es/config/ZtxkContext.d.ts

@@ -34,6 +34,10 @@ interface IZtxkConfig {
      * 表单是否默认开启常用搜索功能。
      */
     enableCommonSearch?: boolean;
+    /**
+     * 动态列模态框是否默认开启搜索功能
+     */
+    enableDynamicColumnSearch?: boolean;
 }
 declare const ZtxkContext: React__default.Context<IZtxkConfig>;
 

package/dist/es/config/ZtxkContext.js

@@ -8,6 +8,7 @@ var ztxkConfig = {
     editTableInputMode: "div",
     customConfigFetch: undefined,
     enableCommonSearch: false,
+    enableDynamicColumnSearch: false,
 };
 var ZtxkContext = React__default.createContext(ztxkConfig);
 

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -6,6 +6,10 @@ import { useDynamic } from './useDynamic.js';
 import { useDrawer } from './hooks.js';
 import MoreConfig from './moreConfig.js';
 import useSearch from './useSearch.js';
+import '../config/ZtxkContext.js';
+import useBaseContext from '../config/useBaseContext.js';
+import '../config/MyStorage.js';
+import { useLatest } from 'ahooks';
 import myMessage from '../message/index.js';
 import SettingOutlined from '../node_modules/@ant-design/icons/es/icons/SettingOutlined.js';
 import Input from '../input/input.js';
@@ -25,6 +29,12 @@ var sortDynamicListByType = function (list) {
 // 这里操作的一直都是内部设置的list
 var DynamicDrawer = function (props, ref) {
     var list = props.list, dynamicKey = props.dynamicKey, parentDynamicKey = props.parentDynamicKey, _a = props.title, title = _a === void 0 ? "自定义配置" : _a, onCurrentListChange = props.onCurrentListChange, isMore = props.isMore, isFixed = props.isFixed, isDimensionDynamic = props.isDimensionDynamic, isSearch = props.isSearch;
+    var enableDynamicColumnSearch = useBaseContext().enableDynamicColumnSearch;
+    // 是否开启搜索功能
+    // 如果全局开启了默认添加，那么只要没有单独配置关闭，都认为需要打开
+    var isDynamicColumnSearchEnabled = enableDynamicColumnSearch
+        ? isSearch !== false
+        : !!isSearch;
     // 根据外部传入的list 和本地存储信息 生成一个内部的currentDynamicList
     // 这个currentDynamicList 是可以是负责显示最终结果的
     // tempDynamicList 是操作时的临时变量 可能操作后不点击确认 直接点击取消 那么需要重置到之前的状态
@@ -48,10 +58,17 @@ var DynamicDrawer = function (props, ref) {
         });
         return _checkedValues;
     }, [tempDynamicList]);
-    var _d = useSearch(tempDynamicList, checkedValues), onSearchHandle = _d.onSearchHandle, onCheckBtn = _d.onCheckBtn, filterDynamicColumns = _d.filterDynamicColumns;
+    var _d = useSearch(tempDynamicList, checkedValues, isDimensionDynamic), onSearchHandle = _d.onSearchHandle, onCheckBtn = _d.onCheckBtn, filterDynamicColumns = _d.filterDynamicColumns;
+    var filterDynamicColumnsRef = useLatest(filterDynamicColumns);
     // 根据isDimension分区
     var _e = useMemo(function () {
-        var dynamicList = filterDynamicColumns || tempDynamicList;
+        var dynamicList = tempDynamicList;
+        // 这里为什么不直接赋值 filterDynamicColumns  是因为某些地方是直接使用item的引用去查找索引的
+        if (filterDynamicColumns) {
+            dynamicList = tempDynamicList.filter(function (item) {
+                return filterDynamicColumns.find(function (i) { return i.key === item.key; });
+            });
+        }
         var dimensionList = dynamicList.filter(function (item) { return item.isDimension; });
         var fieldList = dynamicList.filter(function (item) { return !item.isDimension; });
         return { dimensionList: dimensionList, fieldList: fieldList };
@@ -81,6 +98,10 @@ var DynamicDrawer = function (props, ref) {
     }, [tempDynamicList]);
     // 拖拽
     var onMoveItem = useCallback(function (dragIndex, hoverIndex) {
+        // 这里认为如果搜索了，不支持排序。
+        if (filterDynamicColumnsRef.current) {
+            return;
+        }
         if (!isDimensionPriority(dragIndex, hoverIndex)) {
             return;
         }
@@ -96,10 +117,14 @@ var DynamicDrawer = function (props, ref) {
             // 处理左浮动 右浮动数据。需要重新排序
             return sortDynamicListByType(currentList);
         });
-    }, [setTempDynamicList, isDimensionPriority]);
+    }, [setTempDynamicList, isDimensionPriority, filterDynamicColumnsRef]);
     // 子元素拖拽
     var onChildMoveItem = useCallback(function (pIndex, pKey) {
         return function (dragIndex, hoverIndex) {
+            // 这里认为如果搜索了，不支持排序。
+            if (filterDynamicColumnsRef.current) {
+                return;
+            }
             // 由于对于固定列，不能进行拖拽排序，所以需要找出所有包含固定列的属性出来
             setTempDynamicList(function (preDynamicList) {
                 var newDynamicList = preDynamicList.map(function (item) { return (__assign({}, item)); }) || [];
@@ -120,7 +145,7 @@ var DynamicDrawer = function (props, ref) {
                 return __spreadArray(__spreadArray(__spreadArray([], leftList, true), middleList, true), rightList, true);
             });
         };
-    }, [setTempDynamicList]);
+    }, [setTempDynamicList, filterDynamicColumnsRef]);
     // 确认
     var onSureHandle = function () {
         onSure && onSure(tempDynamicList);
@@ -277,7 +302,7 @@ var DynamicDrawer = function (props, ref) {
     };
     /**底部按钮 */
     var renderFooter = function () { return (jsxs(Fragment, { children: [jsx(ButtonCom, __assign({ type: "default", onClick: onClose }, { children: "\u53D6\u6D88" })), jsx(ButtonCom, __assign({ type: "default", onClick: onReset }, { children: "\u91CD\u7F6E" })), jsx(ButtonCom, __assign({ type: "primary", onClick: onSureHandle }, { children: "\u786E\u5B9A" }))] })); };
-    return (jsx(Drawer, __assign({ className: "dynamic-drawer", title: jsxs("div", { children: [jsx(SettingOutlined, { style: { fontSize: 16 } }), jsxs("span", __assign({ className: "search-drawer--title-text" }, { children: [title, jsx("span", { children: "\uFF08\u62D6\u62FD\u6392\u5E8F\uFF09" })] }))] }), width: 300, placement: "right", open: visible, closable: false, maskClosable: false, footer: renderFooter() }, { children: jsxs("div", __assign({ className: "search-drawer--filter" }, { children: [isSearch ? (jsxs("div", __assign({ className: "search-drawer--filter-input" }, { children: [jsx(Input.Search, { placeholder: "\u641C\u7D22", onSearch: onSearchHandle }), jsx(ButtonCom, __assign({ type: "default", className: "selector-all", loading: false, onClick: function () { return onCheckBtn("all", onCheckboxChange); } }, { children: "\u5168\u9009" })), jsx(ButtonCom, __assign({ type: "default", className: "selector-inverse", loading: false, onClick: function () { return onCheckBtn("inverse", onCheckboxChange); } }, { children: "\u53CD\u9009" }))] }))) : null, jsx(Checkbox.Group, __assign({ value: checkedValues, onChange: onCheckboxChange }, { children: jsxs(Sortable, { children: [isDimensionDynamic && renderSection(dimensionList, 0, "维度配置"), renderSection(fieldList, dimensionList.length, isDimensionDynamic ? "字段配置" : undefined)] }) }))] })) })));
+    return (jsx(Drawer, __assign({ className: "dynamic-drawer", title: jsxs("div", { children: [jsx(SettingOutlined, { style: { fontSize: 16 } }), jsxs("span", __assign({ className: "search-drawer--title-text" }, { children: [title, jsx("span", { children: "\uFF08\u62D6\u62FD\u6392\u5E8F\uFF09" })] }))] }), width: 300, placement: "right", open: visible, closable: false, maskClosable: false, footer: renderFooter() }, { children: jsxs("div", __assign({ className: "search-drawer--filter" }, { children: [isDynamicColumnSearchEnabled ? (jsxs("div", __assign({ className: "search-drawer--filter-input" }, { children: [jsx(Input.Search, { placeholder: "\u641C\u7D22", onSearch: onSearchHandle }), jsx(ButtonCom, __assign({ type: "default", className: "selector-all", loading: false, onClick: function () { return onCheckBtn("all", onCheckboxChange); } }, { children: "\u5168\u9009" })), jsx(ButtonCom, __assign({ type: "default", className: "selector-inverse", loading: false, onClick: function () { return onCheckBtn("inverse", onCheckboxChange); } }, { children: "\u53CD\u9009" }))] }))) : null, jsx(Checkbox.Group, __assign({ value: checkedValues, onChange: onCheckboxChange }, { children: jsxs(Sortable, { children: [isDimensionDynamic && renderSection(dimensionList, 0, "维度配置"), renderSection(fieldList, dimensionList.length, isDimensionDynamic ? "字段配置" : undefined)] }) }))] })) })));
 };
 DynamicDrawer.displayName = "ZTXK_WEBUI_DynamicDrawer";
 var DynamicDrawer$1 = memo(forwardRef(DynamicDrawer));

package/dist/es/dynamicsetting/useSearch.js

@@ -1,7 +1,8 @@
 import { __spreadArray } from '../_virtual/_tslib.js';
 import { useState } from 'react';
+import myMessage from '../message/index.js';
 
-function useSearch(dynamicList, checkedValues) {
+function useSearch(dynamicList, checkedValues, isDimensionDynamic) {
     // 过滤后的可见列集合（仅操作此集合中的列）
     var _a = useState(null), filterDynamicColumns = _a[0], setFilterDynamicColumns = _a[1];
     // 未参与过滤的列，但是选中了的值
@@ -21,6 +22,10 @@ function useSearch(dynamicList, checkedValues) {
      *  4. 仅当操作后选中状态发生变化时才更新，避免无效渲染
      */
     var onCheckBtn = function (type, onCheckboxChange) {
+        if (isDimensionDynamic) {
+            myMessage.warn("维度列不支持全选/反选");
+            return;
+        }
         // 1. 确定操作的目标列集合：仅对「过滤后可见列」操作（优先 filterDynamicColumns，无则用 dynamicColumns）
         var targetColumns = filterDynamicColumns !== null && filterDynamicColumns !== void 0 ? filterDynamicColumns : dynamicList;
         // 2. 拆分目标列中的两类列（仅在可见列范围内处理）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.7.8",
+  "version": "2.7.9",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",