ronds-metadata 1.2.94 → 1.2.95

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-07-04 16:30:59
+ * @LastEditTime: 2023-08-14 09:44:23
  */
 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, findTopParentIndex } from '../utils';
 function Index(props) {
-  var _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13, _extraInfo$http14;
+  var _extraInfo$http11, _extraInfo$http12, _extraInfo$http13, _extraInfo$http14, _extraInfo$http15, _extraInfo$http16;
   var id = props.id,
     name = props.name,
     isRefForm = props.isRefForm,
@@ -274,12 +274,12 @@ 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$http3, _extraInfo$http4, _extraInfo$http5, res;
+    var _extraInfo$http3, _extraInfo$http4, _extraInfo$http5, res, _extraInfo$http6, _extraInfo$http7, _enum;
     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 = 7;
+            _context2.next = 9;
             break;
           }
           _context2.next = 3;
@@ -293,9 +293,22 @@ function Index(props) {
             setTreeData(_toConsumableArray(res));
           }
           return _context2.abrupt("return", res);
-        case 7:
+        case 9:
+          if (!initEnumValue[id]) {
+            _context2.next = 14;
+            break;
+          }
+          _enum = deepClone(initEnumValue[id]);
+          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http6 = extraInfo.http) === null || _extraInfo$http6 === void 0 ? void 0 : _extraInfo$http6.isCascader) {
+            setCascaderOption(_toConsumableArray(_enum));
+          }
+          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isTreeSelect) {
+            setTreeData(_toConsumableArray(_enum));
+          }
+          return _context2.abrupt("return", _enum);
+        case 14:
           return _context2.abrupt("return", []);
-        case 8:
+        case 15:
         case "end":
           return _context2.stop();
       }
@@ -524,7 +537,7 @@ function Index(props) {
     }
   };
   if (isObj && isRefForm && field) {
-    var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8;
+    var _extraInfo$http8, _extraInfo$http9, _extraInfo$http10;
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
         flex: 1,
@@ -552,7 +565,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.isTreeSelect, (_extraInfo$http8 = extraInfo.http) === null || _extraInfo$http8 === void 0 ? void 0 : _extraInfo$http8.isPagination));
+    }), 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));
   }
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
     key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
@@ -582,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$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, {
+  }, 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)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -593,6 +606,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$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));
+  }), processSelectType((_extraInfo$http14 = extraInfo.http) === null || _extraInfo$http14 === void 0 ? void 0 : _extraInfo$http14.isCascader, (_extraInfo$http15 = extraInfo.http) === null || _extraInfo$http15 === void 0 ? void 0 : _extraInfo$http15.isTreeSelect, (_extraInfo$http16 = extraInfo.http) === null || _extraInfo$http16 === void 0 ? void 0 : _extraInfo$http16.isPagination));
 }
 export default /*#__PURE__*/React.memo(Index);

package/es/index.d.ts

@@ -19,7 +19,7 @@ export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
 export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
 export { default as useObservable } from './framework/rxjs-hooks/useObservable';
-export { useModel, Provider, Context, Model } from './framework/hooks/useModel';
+export { useModel, Provider, Context } from './framework/hooks/useModel';
 export { default as useSyncScroll, useSyncScrollByRefs } from './framework/hooks/use-sync-scroll';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';
 export { FormRobot } from './framework/fg/index';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-08-02 08:35:33
+ * @LastEditTime: 2023-08-02 08:41:39
  */
 import './theme.less';
 export { default as MetadataEdit } from './comps/MetadataEdit';

package/package.json

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