ronds-metadata 1.2.16 → 1.2.17

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

@@ -19,6 +19,8 @@ import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/divider/style";
 import _Divider from "antd/es/divider";
+import "antd/es/tree-select/style";
+import _TreeSelect from "antd/es/tree-select";
 import "antd/es/cascader/style";
 import _Cascader from "antd/es/cascader";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
@@ -32,7 +34,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-03-06 14:43:01
+ * @LastEditTime: 2023-03-06 16:24:14
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -45,7 +47,7 @@ import useObservable from '../../../framework/rxjs-hooks/useObservable';
 import { assign } from '../utils';
 
 function Index(props) {
-  var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8, _extraInfo$http9;
+  var _extraInfo$http8, _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13;
 
   var id = props.id,
       name = props.name,
@@ -68,17 +70,22 @@ function Index(props) {
       cascaderOption = _React$useState2[0],
       setCascaderOption = _React$useState2[1];
 
-  var _React$useState3 = React.useState(),
+  var _React$useState3 = React.useState([]),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      watchValue = _React$useState4[0],
-      setWatchValue = _React$useState4[1];
+      treeData = _React$useState4[0],
+      setTreeData = _React$useState4[1];
+
+  var _React$useState5 = React.useState(),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      watchValue = _React$useState6[0],
+      setWatchValue = _React$useState6[1];
 
   var watchValueRef = React.useRef();
 
-  var _React$useState5 = React.useState([]),
-      _React$useState6 = _slicedToArray(_React$useState5, 2),
-      mutiSelect = _React$useState6[0],
-      setMutiSelect = _React$useState6[1];
+  var _React$useState7 = React.useState([]),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      mutiSelect = _React$useState8[0],
+      setMutiSelect = _React$useState8[1];
 
   var pageRef = React.useRef(1);
   var totalRef = React.useRef();
@@ -101,6 +108,8 @@ function Index(props) {
         var _watchArr = _watch.split(',');
 
         if (_watchArr.length === 1) {
+          var _p$payload;
+
           var evalString = '';
 
           for (var i = 0; i < name.length; i++) {
@@ -126,7 +135,7 @@ function Index(props) {
             }
           }
 
-          if (_changeData) {
+          if (_changeData && !(p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.trigger)) {
             setTimeout(function () {
               var v = {};
               assign(name, undefined, v);
@@ -134,6 +143,8 @@ function Index(props) {
             }, 100);
           }
         } else {
+          var _p$payload2;
+
           var b = false;
 
           for (var _i = 0; _i < _watchArr.length; _i++) {
@@ -157,7 +168,7 @@ function Index(props) {
             }
           }
 
-          if (b) {
+          if (b && !(p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.trigger)) {
             setWatchValue(_objectSpread({}, watchValueRef.current));
             setTimeout(function () {
               var v = {};
@@ -198,7 +209,7 @@ function Index(props) {
               totalRef.current = res === null || res === void 0 ? void 0 : res.total;
 
               if (!(_res && _res.length > 0)) {
-                _context.next = 17;
+                _context.next = 19;
                 break;
               }
 
@@ -218,6 +229,14 @@ function Index(props) {
               return _context.abrupt("return", _res);
 
             case 14:
+              if (!(http === null || http === void 0 ? void 0 : http.isTreeSelect)) {
+                _context.next = 16;
+                break;
+              }
+
+              return _context.abrupt("return", _res);
+
+            case 16:
               return _context.abrupt("return", _res.map(function (it) {
                 if (http === null || http === void 0 ? void 0 : http.isCascader) {
                   return {
@@ -234,11 +253,11 @@ function Index(props) {
                 }
               }));
 
-            case 17:
+            case 19:
               console.warn("".concat(_url, " is not return success result"));
               return _context.abrupt("return", []);
 
-            case 19:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -284,14 +303,14 @@ 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, res;
+    var _extraInfo$http2, _extraInfo$http3, _extraInfo$http4, res;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             if (!((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http) && (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.url))) {
-              _context2.next = 6;
+              _context2.next = 7;
               break;
             }
 
@@ -305,12 +324,16 @@ function Index(props) {
               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) {
+              setTreeData(_toConsumableArray(res));
+            }
+
             return _context2.abrupt("return", res);
 
-          case 6:
+          case 7:
             return _context2.abrupt("return", []);
 
-          case 7:
+          case 8:
           case "end":
             return _context2.stop();
         }
@@ -394,7 +417,7 @@ function Index(props) {
     }
   };
 
-  var processSelectType = function processSelectType(isCascader, isPagination) {
+  var processSelectType = function processSelectType(isCascader, isTreeSelect, isPagination) {
     if (isCascader) {
       var _extraInfo$disabled;
 
@@ -405,13 +428,34 @@ function Index(props) {
         loadData: loadData,
         maxTagCount: 10
       });
-    } else if (isPagination) {
+    } else if (isTreeSelect) {
       var _extraInfo$disabled2;
 
+      return /*#__PURE__*/React.createElement(_TreeSelect, {
+        showSearch: true,
+        multiple: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple,
+        style: {
+          width: '100%'
+        },
+        dropdownStyle: {
+          maxHeight: 400,
+          overflow: 'auto'
+        },
+        treeData: treeData,
+        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,
+        treeDefaultExpandAll: true,
+        maxTagCount: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagCount,
+        maxTagTextLength: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagTextLength,
+        maxTagPlaceholder: "..."
+      });
+    } else if (isPagination) {
+      var _extraInfo$disabled3;
+
       return /*#__PURE__*/React.createElement(_Select, {
         mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
         onSelect: onSelect,
-        disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
+        disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
         options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
         dropdownRender: function dropdownRender(menu) {
@@ -470,12 +514,12 @@ function Index(props) {
         }, it.label));
       })));
     } else {
-      var _extraInfo$disabled3;
+      var _extraInfo$disabled4;
 
       return /*#__PURE__*/React.createElement(_Select, {
         mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
         onSelect: onSelect,
-        disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
+        disabled: (_extraInfo$disabled4 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled4 !== void 0 ? _extraInfo$disabled4 : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
         options: myOptions,
         showSearch: true,
@@ -490,14 +534,14 @@ function Index(props) {
         allowClear: true,
         onChange: onSelectChange,
         maxTagCount: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagCount,
-        maxTagTextLength: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagTextLength) || 9,
+        maxTagTextLength: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagTextLength,
         maxTagPlaceholder: "..."
       });
     }
   };
 
   if (isObj && isRefForm && field) {
-    var _extraInfo$http4, _extraInfo$http5;
+    var _extraInfo$http5, _extraInfo$http6, _extraInfo$http7;
 
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
@@ -523,7 +567,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$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isCascader, (_extraInfo$http5 = extraInfo.http) === null || _extraInfo$http5 === void 0 ? void 0 : _extraInfo$http5.isPagination));
+    }), 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));
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
@@ -551,7 +595,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$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.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+  }, 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, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -562,7 +606,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.isPagination));
+  }), 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));
 }
 
 export default /*#__PURE__*/React.memo(Index);

package/es/comps/MetadataForm/index.js

@@ -118,8 +118,9 @@ var MetadataForm = function MetadataForm(props) {
           stream$.next({
             type: 'onValuesChange',
             payload: {
-              val: {},
-              allVals: vals
+              val: vals,
+              allVals: vals,
+              trigger: 'firstLoad'
             }
           });
         }

package/package.json

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