[v4.15.0] feat(Table): Table 支持树形数据显示和可展开同时出现 (#703) 55219d5

uiwjs · Mar 22, 2022 · 779233e · 779233e
1 parent f210555
commit 779233e
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 17 deletions.
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.ac3a945d.css",
-    "main.js": "/static/js/main.b79cc891.js",
+    "main.js": "/static/js/main.36d0be29.js",
     "static/css/9200.14abaeb3.chunk.css": "/static/css/9200.14abaeb3.chunk.css",
     "static/js/9200.0a1f7353.chunk.js": "/static/js/9200.0a1f7353.chunk.js",
     "static/css/6730.4f744b40.chunk.css": "/static/css/6730.4f744b40.chunk.css",
@@ -200,7 +200,7 @@
     "static/js/7664.f92b74f7.chunk.js": "/static/js/7664.f92b74f7.chunk.js",
     "static/js/9961.9db8f620.chunk.js": "/static/js/9961.9db8f620.chunk.js",
     "static/js/3811.ac38cada.chunk.js": "/static/js/3811.ac38cada.chunk.js",
-    "static/js/6659.db759a7b.chunk.js": "/static/js/6659.db759a7b.chunk.js",
+    "static/js/6659.32d92089.chunk.js": "/static/js/6659.32d92089.chunk.js",
     "static/js/2448.1d46904a.chunk.js": "/static/js/2448.1d46904a.chunk.js",
     "static/js/207.891adb65.chunk.js": "/static/js/207.891adb65.chunk.js",
     "static/js/7861.757503f5.chunk.js": "/static/js/7861.757503f5.chunk.js",
@@ -223,7 +223,7 @@
     "static/js/5183.ac2ca737.js": "/static/js/5183.ac2ca737.js",
     "index.html": "/index.html",
     "main.ac3a945d.css.map": "/static/css/main.ac3a945d.css.map",
-    "main.b79cc891.js.map": "/static/js/main.b79cc891.js.map",
+    "main.36d0be29.js.map": "/static/js/main.36d0be29.js.map",
     "9200.14abaeb3.chunk.css.map": "/static/css/9200.14abaeb3.chunk.css.map",
     "9200.0a1f7353.chunk.js.map": "/static/js/9200.0a1f7353.chunk.js.map",
     "6730.4f744b40.chunk.css.map": "/static/css/6730.4f744b40.chunk.css.map",
@@ -422,7 +422,7 @@
     "7664.f92b74f7.chunk.js.map": "/static/js/7664.f92b74f7.chunk.js.map",
     "9961.9db8f620.chunk.js.map": "/static/js/9961.9db8f620.chunk.js.map",
     "3811.ac38cada.chunk.js.map": "/static/js/3811.ac38cada.chunk.js.map",
-    "6659.db759a7b.chunk.js.map": "/static/js/6659.db759a7b.chunk.js.map",
+    "6659.32d92089.chunk.js.map": "/static/js/6659.32d92089.chunk.js.map",
     "2448.1d46904a.chunk.js.map": "/static/js/2448.1d46904a.chunk.js.map",
     "207.891adb65.chunk.js.map": "/static/js/207.891adb65.chunk.js.map",
     "7861.757503f5.chunk.js.map": "/static/js/7861.757503f5.chunk.js.map",
@@ -448,6 +448,6 @@
     "static/js/vendors-react.a09f50fb.js",
     "static/js/5183.ac2ca737.js",
     "static/css/main.ac3a945d.css",
-    "static/js/main.b79cc891.js"
+    "static/js/main.36d0be29.js"
   ]
 }
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><html xmlns="http://www.w3.org/1999/xhtml"><head><title>uiw react, A high quality UI Toolkit, A Component Library for React 16+.</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="UIW React, A high quality UI Toolkit, A Component Library for React 16+. "><meta name="keywords" content="uiw, uiw-react, uiwjs, react.js, react, component, components, ui, framework, toolkit"><script defer="defer" src="./static/js/vendors-react.a09f50fb.js"></script><script defer="defer" src="./static/js/5183.ac2ca737.js"></script><script defer="defer" src="./static/js/main.b79cc891.js"></script><link href="./static/css/main.ac3a945d.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html xmlns="http://www.w3.org/1999/xhtml"><head><title>uiw react, A high quality UI Toolkit, A Component Library for React 16+.</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="UIW React, A high quality UI Toolkit, A Component Library for React 16+. "><meta name="keywords" content="uiw, uiw-react, uiwjs, react.js, react, component, components, ui, framework, toolkit"><script defer="defer" src="./static/js/vendors-react.a09f50fb.js"></script><script defer="defer" src="./static/js/5183.ac2ca737.js"></script><script defer="defer" src="./static/js/main.36d0be29.js"></script><link href="./static/css/main.ac3a945d.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
diff --git a/static/js/6659.db759a7b.chunk.js → static/js/6659.32d92089.chunk.js b/static/js/6659.db759a7b.chunk.js → static/js/6659.32d92089.chunk.js
diff --git a/static/js/6659.db759a7b.chunk.js.map → static/js/6659.32d92089.chunk.js.map b/static/js/6659.db759a7b.chunk.js.map → static/js/6659.32d92089.chunk.js.map
diff --git a/static/js/main.b79cc891.js → static/js/main.36d0be29.js b/static/js/main.b79cc891.js → static/js/main.36d0be29.js
diff --git a/static/js/main.36d0be29.js.map b/static/js/main.36d0be29.js.map
diff --git a/static/js/main.b79cc891.js.map b/static/js/main.b79cc891.js.map
diff --git a/uiw.js b/uiw.js
@@ -9371,9 +9371,11 @@ function TableTr(props) {
     locationWidth
   } = props;
   var [isOpacity, setIsOpacity] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
+  var [childrenIndex, setChildrenIndex] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0);
   var [expandIndex, setExpandIndex] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
     setIsOpacity(!!(data != null && data.find(it => it[childrenColumnName])));
+    setChildrenIndex((keys == null ? void 0 : keys.findIndex(it => it.key === 'uiw-expanded')) === -1 ? 0 : 1);
   }, [data]);
   var IconDom = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => {
     return (key, isOpacity) => {
@@ -9429,7 +9431,7 @@ function TableTr(props) {
 
             var isHasChildren = Array.isArray(trData[childrenColumnName]);
 
-            if (colNum === 0 && (isOpacity || hierarchy || isHasChildren)) {
+            if (colNum === childrenIndex && (isOpacity || hierarchy || isHasChildren)) {
               objs.children = /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
                 children: [IconDom(key, isHasChildren), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                   style: {
@@ -9462,10 +9464,10 @@ function TableTr(props) {
               }, evn)
             }));
           })
-        }, key), expandIndex.includes(key) && /*#__PURE__*/(0,jsx_runtime.jsx)(TableTr, _extends({}, props, {
+        }, key), isExpandedDom(trData, rowNum), expandIndex.includes(key) && /*#__PURE__*/(0,jsx_runtime.jsx)(TableTr, _extends({}, props, {
           data: trData[childrenColumnName],
           hierarchy: hierarchy + 1
-        })), isExpandedDom(trData, rowNum)]
+        }))]
       }, rowNum);
     })
   });
@@ -9544,9 +9546,23 @@ function Table(props) {
   };
 
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
+    var childKey = (expandable == null ? void 0 : expandable.childrenColumnName) || 'children';
+
+    var deep = params => {
+      var arr1 = [];
+      var arr = params.map((it, index) => {
+        if (Array.isArray(it[childKey])) {
+          arr1.push(...deep(it[childKey]));
+        }
+
+        return rowKey ? it[rowKey] : index;
+      });
+      return [...arr1, ...arr];
+    };
+
     if (expandable) {
       if (expandable.defaultExpandAllRows) {
-        setExpandIndex(data.map((it, index) => rowKey ? it[rowKey] : index));
+        setExpandIndex(deep(data));
         return;
       }
 

diff --git a/uiw.min.js b/uiw.min.js