zmdms-webui 0.0.87 → 0.0.89

package/dist/es/dynamicsetting/useDynamic.js

@@ -39,15 +39,25 @@ function recursionDynamicItems(list, currentDynamicList) {
         }
     });
 }
+// 直接递归给子元素添加已找到标识，这里是不存在dynamic的情况的处理
+function recursionAddFind(list) {
+    var newList = [];
+    list.forEach(function (item) {
+        var newItem = __assign(__assign({}, item), { checked: item.checked !== undefined ? item.checked : true });
+        if (newItem.children) {
+            newItem.children = recursionAddFind(newItem.children);
+        }
+        newList.push(__assign(__assign({}, newItem), { isFind: true }));
+    });
+    return newList;
+}
 function recursionDeleteDynamicItems(currentDynamicList) {
     return currentDynamicList
         .filter(function (item) {
         if (item.isFind) {
             // 这里递归找子元素删除子元素逻辑
             if (Array.isArray(item.children)) {
-                console.log(item.children);
                 item.children = recursionDeleteDynamicItems(item.children);
-                console.log(item.children);
             }
             return true;
         }
@@ -79,6 +89,10 @@ function getCurrentDynamicItems(dynamicKey, parentDynamicKey, list) {
             // 如果缓存中没值，那么以传入的配置为准
             list.forEach(function (item) {
                 var result = __assign(__assign({}, item), { checked: item.checked !== undefined ? item.checked : true });
+                // 这里要递归将子元素添加已找到的标识
+                if (result.children) {
+                    result.children = recursionAddFind(result.children);
+                }
                 currentDynamicList_1.push(__assign(__assign({}, result), { isFind: true }));
             });
         }

package/dist/es/table/table.js

@@ -28,8 +28,8 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现小计 总计功能
 // completed: 实现可拖拽行
 // completed: 实现可编辑功能
-// TODO: 实现虚拟滚动配置
-// TODO: 实现表头自定义伸缩
+// completed: 实现虚拟滚动配置
+// completed: 实现表头自定义伸缩
 var Table = function (props) {
     // console.log("表格渲染");
     var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, hiddenDynamicIcon = props.hiddenDynamicIcon, columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, _c = props.isDelAll, isDelAll = _c === void 0 ? true : _c, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _d = props.summaryFixed, summaryFixed = _d === void 0 ? true : _d, isInnerPagination = props.isInnerPagination, _e = props.innerPaginationPageSize, innerPaginationPageSize = _e === void 0 ? 30 : _e, _f = props.innerPaginationPosition, innerPaginationPosition = _f === void 0 ? INNER_TABLE_PAGINATION_POSITION : _f, _g = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _g === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _g, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _h = props.isResizableColumn, isResizableColumn = _h === void 0 ? true : _h, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "addMode", "addCallback", "isDel", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn"]);
@@ -226,7 +226,13 @@ var Table = function (props) {
                 : paginationConfig
             : pagination, rowClassName: rowClassName }, resetProps)));
     return (jsxs("div", __assign({ style: isFlex
-            ? { position: "relative", overflow: "hidden", flex: 1 }
+            ? {
+                position: "relative",
+                overflow: "hidden",
+                flex: 1,
+                // 需要给一个最小的高度
+                minHeight: "200px",
+            }
             : { position: "relative", overflow: "hidden" }, ref: tableRef }, { children: [isMove ? (jsx(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: SingleTable }))) : (SingleTable), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true })) : null] })));
 };
 var MemoTable = memo(Table);