@cqsjjb/jjb-react-admin-component 3.3.1-beta.3 → 3.3.1-beta.5

package/AdaptiveTree/index.js

@@ -109,6 +109,7 @@ export default props => {
 
   // 获得指定索引的节点 ID
   const getLevelIndexNodeIds = (targetIndexArr, key) => {
+    const children = props?.fieldNames?.children || 'children';
     const pathNodes = [];
     const pathNodesIds = [];
     let currentData = props.treeData || [];
@@ -121,10 +122,10 @@ export default props => {
         }
         nextNode = currentData[index];
       } else {
-        if (!currentData?.children || !Array.isArray(currentData.children) || index < 0 || index >= currentData.children.length) {
+        if (!currentData?.[children] || !Array.isArray(currentData[children]) || index < 0 || index >= currentData[children].length) {
           return null;
         }
-        nextNode = currentData.children[index];
+        nextNode = currentData?.[children][index];
       }
       pathNodes.push(nextNode);
       pathNodesIds.push(nextNode[key]);

package/Table/index.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { tools } from '@cqsjjb/jjb-common-lib';
 import { ProTable } from '@ant-design/pro-components';
 import { useAntdResizableHeader } from 'use-antd-resizable-header';
-import { antPrefix, setTableSize, getTableSize, getPersistenceKey, isNull } from './utils';
+import { antPrefix, setTableSize, getTableSize, getPersistenceKey } from './utils';
 import './index.less';
 require('use-antd-resizable-header/dist/style.css');
 export default function TablePro(props) {
@@ -94,9 +94,8 @@ export default function TablePro(props) {
     size: size,
     search: false,
     scroll: scroll,
-    columns: resizableColumns,
     className: `${antPrefix}-gbs-pro-table`,
-    options: !isNull(props.options) ? props.options : {
+    options: {
       reload: false,
       fullScreen: true,
       setting: {
@@ -113,5 +112,7 @@ export default function TablePro(props) {
       persistenceType: 'localStorage'
     },
     onSizeChange: setSize
-  }, props)));
+  }, props, {
+    columns: resizableColumns
+  })));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.1-beta.3",
+  "version": "3.3.1-beta.5",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",