ronds-metadata 1.2.51 → 1.2.53

package/es/comps/MetadataForm/DataCell/Select.js

@@ -37,7 +37,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-05-18 10:18:36
+ * @LastEditTime: 2023-05-18 15:32:01
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -47,7 +47,7 @@ import { deepClone } from '../../../utils';
 import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
 import { tr } from '../../../framework/locale';
 import useObservable from '../../../framework/rxjs-hooks/useObservable';
-import { assignReplace } from '../utils';
+import { assignReplace, findTopParentIndex } from '../utils';
 function Index(props) {
   var _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13, _extraInfo$http14;
   var id = props.id,
@@ -381,10 +381,11 @@ function Index(props) {
   };
   var onDropdownVisibleChange = function onDropdownVisibleChange(_open) {
     setTreeselectOpen(_open);
-    if (_open && expandedKeys.length > 0 && treeRef.current) {
+    if (_open && expandedKeys.length > 0 && treeRef.current && treeData.length > 0) {
       setTimeout(function () {
+        var idx = findTopParentIndex(treeData, expandedKeys[0]);
         treeRef.current.scrollTo({
-          key: expandedKeys[0],
+          index: idx,
           align: 'top',
           offset: 40
         });
@@ -407,6 +408,7 @@ function Index(props) {
       return /*#__PURE__*/React.createElement(_TreeSelect, {
         showSearch: true,
         ref: treeRef,
+        virtual: true,
         filterTreeNode: function filterTreeNode(input, treeNode) {
           var _treeNode$label;
           return (treeNode === null || treeNode === void 0 ? void 0 : (_treeNode$label = treeNode.label) === null || _treeNode$label === void 0 ? void 0 : _treeNode$label.toString().indexOf(input)) >= 0;

package/es/comps/MetadataForm/constants.d.ts

@@ -3,4 +3,5 @@ export declare const STREAM_EVENT_TYPE: {
     ON_BUTTON_CELL_CLICK: string;
     ON_VALUES_CHANGE: string;
     ON_WATCH_DEPEND: string;
+    ON_DROPDOWN_VISIBLE_CHANGE: string;
 };

package/es/comps/MetadataForm/constants.js

@@ -1,11 +1,12 @@
 /*
  * @Author: wangxian
  * @Date: 2023-02-03 09:08:06
- * @LastEditTime: 2023-02-03 09:10:19
+ * @LastEditTime: 2023-05-18 13:50:43
  */
 export var STREAM_EVENT_TYPE = {
   ON_SELECT_CHANGE: 'onSelectChange',
   ON_BUTTON_CELL_CLICK: 'onButtonCellClick',
   ON_VALUES_CHANGE: 'onValuesChange',
-  ON_WATCH_DEPEND: 'onWatchDepend'
+  ON_WATCH_DEPEND: 'onWatchDepend',
+  ON_DROPDOWN_VISIBLE_CHANGE: 'onDropdownVisibleChange'
 };

package/es/comps/MetadataForm/index.d.ts

@@ -67,7 +67,14 @@ interface IMetadataFormProps {
      */
     onSelectChange?: (changedValues: any) => void;
     /**
-     * select选择的回调
+     * TreeSelect展开下拉菜单的回调
+     */
+    onDropdownVisibleChange?: (data: {
+        treeRef: any;
+        key: string;
+    }) => void;
+    /**
+     * 有按钮的表格点击事件
      */
     onCellButtonClick?: (changedValues: any) => void;
 }

package/es/comps/MetadataForm/index.js

@@ -41,6 +41,7 @@ var MetadataForm = function MetadataForm(props) {
     getFormInstance = props.getFormInstance,
     onValuesChange = props.onValuesChange,
     onSelectChange = props.onSelectChange,
+    onDropdownVisibleChange = props.onDropdownVisibleChange,
     onCellButtonClick = props.onCellButtonClick;
   var _React$useState = React.useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -68,6 +69,9 @@ var MetadataForm = function MetadataForm(props) {
       case STREAM_EVENT_TYPE.ON_SELECT_CHANGE:
         onSelectChange && onSelectChange(p.payload);
         break;
+      case STREAM_EVENT_TYPE.ON_DROPDOWN_VISIBLE_CHANGE:
+        onDropdownVisibleChange && onDropdownVisibleChange(p.payload);
+        break;
       case STREAM_EVENT_TYPE.ON_BUTTON_CELL_CLICK:
         onCellButtonClick && onCellButtonClick(p.payload);
         break;

package/es/comps/MetadataForm/utils.d.ts

@@ -15,3 +15,6 @@ export declare function renderForm(schemaRef: any[], options: IFormOptions, colS
 export declare function getLabelByProps(data: any): any;
 export declare function assign(pathArr: string[], val: any, obj: any): void;
 export declare function assignReplace(pathArr: string[], val: any, obj: any): void;
+export declare function flattenTreeData(treeData: any[]): any;
+export declare function findTopParent(treeData: any[], value: string): any;
+export declare const findTopParentIndex: (treeData: any[], key: string) => number;

package/es/comps/MetadataForm/utils.js

@@ -1,12 +1,17 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import _extends from "@babel/runtime/helpers/esm/extends";
+var _excluded = ["children"];
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-28 10:22:47
+ * @LastEditTime: 2023-05-18 16:25:00
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -113,4 +118,64 @@ export function assignReplace(pathArr, val, obj) {
     }
     return cur[key];
   }, obj);
-}
+}
+export function flattenTreeData(treeData) {
+  return treeData.reduce(function (acc, _ref) {
+    var children = _ref.children,
+      rest = _objectWithoutProperties(_ref, _excluded);
+    var flatItem = _objectSpread({}, rest);
+    acc.push(flatItem);
+    if (children) {
+      acc.push.apply(acc, _toConsumableArray(flattenTreeData(children)));
+    }
+    return acc;
+  }, []);
+}
+export function findTopParent(treeData, value) {
+  var topNode = null;
+  function traverse(node, depth) {
+    if (node.value === value && (!topNode || depth < topNode.depth)) {
+      topNode = {
+        node: node,
+        depth: depth
+      };
+    }
+    if ((node === null || node === void 0 ? void 0 : node.children) && (node === null || node === void 0 ? void 0 : node.children.length) > 0) {
+      var _iterator = _createForOfIteratorHelper(node.children),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var child = _step.value;
+          traverse(child, depth + 1);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+  }
+  traverse({
+    children: treeData
+  }, 0);
+  return topNode ? topNode.node : null;
+}
+export var findTopParentIndex = function findTopParentIndex(treeData, key) {
+  var topNodeIndex = -1;
+  function traverse(node, parentIndexes) {
+    if (node.value === key) {
+      topNodeIndex = parentIndexes.reduce(function (total, number) {
+        return total + number;
+      }, 0);
+    }
+    if ((node === null || node === void 0 ? void 0 : node.children) && node.children.length > 0) {
+      node.children.forEach(function (child, idx) {
+        return traverse(child, [].concat(_toConsumableArray(parentIndexes), [idx]));
+      });
+    }
+  }
+  treeData.forEach(function (node, index) {
+    return traverse(node, [index]);
+  });
+  return topNodeIndex;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.2.51",
+  "version": "1.2.53",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",