ronds-metadata 1.2.47 → 1.2.48

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

@@ -16,7 +16,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-05-11 09:08:41
+ * @LastEditTime: 2023-05-16 11:13:07
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -46,17 +46,23 @@ function Index(props) {
     rules = _React$useState4[0],
     setRules = _React$useState4[1];
   useObservable(function (p) {
-    if ((p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
-      var _extraInfo$addonAfter;
-      var evalString = '';
-      for (var i = 0; i < name.length; i++) {
-        evalString = "".concat(evalString, "[name[").concat(i, "]]");
-      }
-      var _value = eval("p?.payload?.allVals".concat(evalString));
-      if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$addonAfter = extraInfo.addonAfter) === null || _extraInfo$addonAfter === void 0 ? void 0 : _extraInfo$addonAfter.key) {
-        setValueTitle(_value === null || _value === void 0 ? void 0 : _value.value);
-      } else {
-        setValueTitle(_value);
+    var _p$payload;
+    if (name && (!(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) || (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) === 'textarea') && (p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.trigger) === 'firstLoad' && (p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
+      try {
+        var _extraInfo$addonAfter;
+        var evalString = '';
+        for (var i = 0; i < name.length; i++) {
+          evalString = "".concat(evalString, "[name[").concat(i, "]]");
+        }
+        var _value = eval("p?.payload?.allVals".concat(evalString));
+        if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$addonAfter = extraInfo.addonAfter) === null || _extraInfo$addonAfter === void 0 ? void 0 : _extraInfo$addonAfter.key) {
+          setValueTitle(_value === null || _value === void 0 ? void 0 : _value.value);
+        } else {
+          setValueTitle(_value);
+        }
+      } catch (error) {
+        // 处理异常情况
+        console.error(error.message);
       }
     }
   }, [formContext.stream$, name, extraInfo]);

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

@@ -28,8 +28,8 @@ import _Tooltip from "antd/es/tooltip";
 import "antd/es/tag/style";
 import _Tag from "antd/es/tag";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -37,7 +37,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-28 10:25:33
+ * @LastEditTime: 2023-05-16 16:38:08
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -49,7 +49,7 @@ import { tr } from '../../../framework/locale';
 import useObservable from '../../../framework/rxjs-hooks/useObservable';
 import { assignReplace } from '../utils';
 function Index(props) {
-  var _extraInfo$http8, _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13;
+  var _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13, _extraInfo$http14;
   var id = props.id,
     name = props.name,
     isRefForm = props.isRefForm,
@@ -73,15 +73,25 @@ function Index(props) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     treeData = _React$useState4[0],
     setTreeData = _React$useState4[1];
-  var _React$useState5 = React.useState(),
+  var _React$useState5 = React.useState(false),
     _React$useState6 = _slicedToArray(_React$useState5, 2),
-    watchValue = _React$useState6[0],
-    setWatchValue = _React$useState6[1];
-  var watchValueRef = React.useRef();
-  var _React$useState7 = React.useState([]),
+    treeselectOpen = _React$useState6[0],
+    setTreeselectOpen = _React$useState6[1];
+  var treeRef = React.useRef(null);
+  var _React$useState7 = React.useState(),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
-    mutiSelect = _React$useState8[0],
-    setMutiSelect = _React$useState8[1];
+    watchValue = _React$useState8[0],
+    setWatchValue = _React$useState8[1];
+  var watchValueRef = React.useRef();
+  var _React$useState9 = React.useState([]),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    mutiSelect = _React$useState10[0],
+    setMutiSelect = _React$useState10[1];
+  var _React$useState11 = React.useState([]),
+    _React$useState12 = _slicedToArray(_React$useState11, 2),
+    expandedKeys = _React$useState12[0],
+    setExpandedKeys = _React$useState12[1];
+  var firstLoadTreeSelectRef = React.useRef(true);
   var pageRef = React.useRef(1);
   var totalRef = React.useRef();
   var onSelect = function onSelect(value) {
@@ -91,10 +101,10 @@ function Index(props) {
     });
   };
   useObservable(function (p) {
-    var _extraInfo$http;
+    var _extraInfo$http, _extraInfo$http2, _p$payload3;
     // 判断是否有 watch的扩展属性
     var _watch = extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.watch;
-    if (_watch && (p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
+    if (name && _watch && (p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
       try {
         var _watchArr = _watch.split(',');
         if (_watchArr.length === 1) {
@@ -130,18 +140,18 @@ function Index(props) {
           var b = false;
           for (var _i = 0; _i < _watchArr.length; _i++) {
             var w = _watchArr[_i];
-            var _evalString = '';
+            var _evalString2 = '';
             for (var _i2 = 0; _i2 < name.length; _i2++) {
               if (_i2 < name.length - 1) {
-                _evalString = "".concat(_evalString, "[name[").concat(_i2, "]]");
+                _evalString2 = "".concat(_evalString2, "[name[").concat(_i2, "]]");
               }
             }
-            var _value2 = eval("p?.payload?.allVals".concat(_evalString, "[w]"));
+            var _value2 = eval("p?.payload?.allVals".concat(_evalString2, "[w]"));
             if (_value2) {
               var _wRef2 = watchValueRef.current || {};
               _wRef2[w] = _value2;
               watchValueRef.current = _wRef2;
-              b = eval("p?.payload?.val".concat(_evalString, "[w]"));
+              b = eval("p?.payload?.val".concat(_evalString2, "[w]"));
             }
           }
           if (b && !(p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.trigger)) {
@@ -157,7 +167,18 @@ function Index(props) {
         console.warn('watch:' + error);
       }
     }
-  }, [formContext.stream$, extraInfo]);
+    if (treeData.length > 0 && name && (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http2 = extraInfo.http) === null || _extraInfo$http2 === void 0 ? void 0 : _extraInfo$http2.isTreeSelect) && (p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.trigger) === 'firstLoad' && (p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
+      var _evalString = '';
+      for (var _i3 = 0; _i3 < name.length; _i3++) {
+        _evalString = "".concat(_evalString, "[name[").concat(_i3, "]]");
+      }
+      var _treeSelectValue = eval("p?.payload?.allVals".concat(_evalString));
+      if (_treeSelectValue) {
+        var selectedKeys = Array.isArray(_treeSelectValue) ? _treeSelectValue : [_treeSelectValue];
+        setExpandedKeys(_toConsumableArray(selectedKeys));
+      }
+    }
+  }, [formContext.stream$, treeData, extraInfo, name]);
   var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(http, pid, page) {
       var server, _url, res, _res;
@@ -253,7 +274,7 @@ function Index(props) {
     return processSelectOptionsData();
   }, [initEnumValue, myEnum, id, extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxSelect]);
   var httpOptions = useAsyncMemo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var _extraInfo$http2, _extraInfo$http3, _extraInfo$http4, res;
+    var _extraInfo$http3, _extraInfo$http4, _extraInfo$http5, res;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -262,13 +283,13 @@ function Index(props) {
             break;
           }
           _context2.next = 3;
-          return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '', (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http2 = extraInfo.http) === null || _extraInfo$http2 === void 0 ? void 0 : _extraInfo$http2.isPagination) && pageRef.current);
+          return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '', (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isPagination) && pageRef.current);
         case 3:
           res = _context2.sent;
-          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isCascader) {
+          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isCascader) {
             setCascaderOption(_toConsumableArray(res));
           }
-          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isTreeSelect) {
+          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http5 = extraInfo.http) === null || _extraInfo$http5 === void 0 ? void 0 : _extraInfo$http5.isTreeSelect) {
             setTreeData(_toConsumableArray(res));
           }
           return _context2.abrupt("return", res);
@@ -355,6 +376,23 @@ function Index(props) {
       return '...';
     }
   };
+  var onExpand = function onExpand(_expandedKeys) {
+    setExpandedKeys(_toConsumableArray(_expandedKeys));
+  };
+  var onDropdownVisibleChange = function onDropdownVisibleChange(_open) {
+    setTreeselectOpen(_open);
+    if (_open && firstLoadTreeSelectRef.current) {
+      setTimeout(function () {
+        var _treeRef$current;
+        (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 ? void 0 : _treeRef$current.scrollTo({
+          key: expandedKeys[0],
+          align: 'top',
+          offset: 40
+        });
+        firstLoadTreeSelectRef.current = false;
+      }, 100);
+    }
+  };
   var processSelectType = function processSelectType(isCascader, isTreeSelect, isPagination) {
     if (isCascader) {
       var _extraInfo$disabled;
@@ -369,6 +407,7 @@ function Index(props) {
       var _extraInfo$disabled2;
       return /*#__PURE__*/React.createElement(_TreeSelect, {
         showSearch: true,
+        ref: treeRef,
         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;
@@ -386,6 +425,10 @@ function Index(props) {
           overflow: 'auto'
         },
         treeData: treeData,
+        onTreeExpand: onExpand,
+        open: treeselectOpen,
+        onDropdownVisibleChange: onDropdownVisibleChange,
+        treeExpandedKeys: expandedKeys,
         allowClear: true,
         disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
@@ -479,7 +522,7 @@ function Index(props) {
     }
   };
   if (isObj && isRefForm && field) {
-    var _extraInfo$http5, _extraInfo$http6, _extraInfo$http7;
+    var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8;
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
         flex: 1,
@@ -507,7 +550,7 @@ function Index(props) {
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-    }), processSelectType((_extraInfo$http5 = extraInfo.http) === null || _extraInfo$http5 === void 0 ? void 0 : _extraInfo$http5.isCascader, (_extraInfo$http6 = extraInfo.http) === null || _extraInfo$http6 === void 0 ? void 0 : _extraInfo$http6.isTreeSelect, (_extraInfo$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isPagination));
+    }), processSelectType((_extraInfo$http6 = extraInfo.http) === null || _extraInfo$http6 === void 0 ? void 0 : _extraInfo$http6.isCascader, (_extraInfo$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isTreeSelect, (_extraInfo$http8 = extraInfo.http) === null || _extraInfo$http8 === void 0 ? void 0 : _extraInfo$http8.isPagination));
   }
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
     key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
@@ -537,7 +580,7 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }, processSelectType((_extraInfo$http8 = extraInfo.http) === null || _extraInfo$http8 === void 0 ? void 0 : _extraInfo$http8.isCascader, (_extraInfo$http9 = extraInfo.http) === null || _extraInfo$http9 === void 0 ? void 0 : _extraInfo$http9.isTreeSelect, (_extraInfo$http10 = extraInfo.http) === null || _extraInfo$http10 === void 0 ? void 0 : _extraInfo$http10.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+  }, processSelectType((_extraInfo$http9 = extraInfo.http) === null || _extraInfo$http9 === void 0 ? void 0 : _extraInfo$http9.isCascader, (_extraInfo$http10 = extraInfo.http) === null || _extraInfo$http10 === void 0 ? void 0 : _extraInfo$http10.isTreeSelect, (_extraInfo$http11 = extraInfo.http) === null || _extraInfo$http11 === void 0 ? void 0 : _extraInfo$http11.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -548,6 +591,6 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }), processSelectType((_extraInfo$http11 = extraInfo.http) === null || _extraInfo$http11 === void 0 ? void 0 : _extraInfo$http11.isCascader, (_extraInfo$http12 = extraInfo.http) === null || _extraInfo$http12 === void 0 ? void 0 : _extraInfo$http12.isTreeSelect, (_extraInfo$http13 = extraInfo.http) === null || _extraInfo$http13 === void 0 ? void 0 : _extraInfo$http13.isPagination));
+  }), processSelectType((_extraInfo$http12 = extraInfo.http) === null || _extraInfo$http12 === void 0 ? void 0 : _extraInfo$http12.isCascader, (_extraInfo$http13 = extraInfo.http) === null || _extraInfo$http13 === void 0 ? void 0 : _extraInfo$http13.isTreeSelect, (_extraInfo$http14 = extraInfo.http) === null || _extraInfo$http14 === void 0 ? void 0 : _extraInfo$http14.isPagination));
 }
 export default /*#__PURE__*/React.memo(Index);

package/package.json

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