ronds-metadata 1.1.58 → 1.1.60

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

@@ -1,6 +1,10 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/radio/style";
+import _Radio from "antd/es/radio";
+import "antd/es/checkbox/style";
+import _Checkbox from "antd/es/checkbox";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import "antd/es/space/style";
@@ -22,7 +26,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-09 15:59:15
+ * @LastEditTime: 2022-11-22 14:42:09
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -31,9 +35,10 @@ import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { deepClone } from '../../../utils';
 import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
 import { tr } from '../../../framework/locale';
+import useObservable from '@/framework/rxjs-hooks/useObservable';
 
 function Index(props) {
-  var _extraInfo$http5, _extraInfo$http6, _extraInfo$http7, _extraInfo$http8;
+  var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8, _extraInfo$http9;
 
   var id = props.id,
       name = props.name,
@@ -54,6 +59,12 @@ function Index(props) {
       cascaderOption = _React$useState2[0],
       setCascaderOption = _React$useState2[1];
 
+  var _React$useState3 = React.useState(),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      watchValue = _React$useState4[0],
+      setWatchValue = _React$useState4[1];
+
+  var watchValueRef = React.useRef();
   var pageRef = React.useRef(1);
   var totalRef = React.useRef();
 
@@ -64,6 +75,22 @@ function Index(props) {
     });
   };
 
+  useObservable(function (p) {
+    var _extraInfo$http;
+
+    // 判断是否有 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) {
+      var _value = p.payload[_watch];
+
+      if (_value) {
+        setWatchValue(_value);
+        watchValueRef.current = _value;
+        formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+      }
+    }
+  }, [formContext.stream$, extraInfo]);
   var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(http, pid, page) {
       var server, _url, res, _res;
@@ -75,16 +102,21 @@ function Index(props) {
               server = new MetadataService();
               _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
               _url = page ? http.url.replace('{page}', page) : _url;
-              _context.next = 5;
+
+              if (watchValueRef.current) {
+                _url = _url.replace('{watch}', watchValueRef.current);
+              }
+
+              _context.next = 6;
               return server.GetEnumDataByUrl(_url);
 
-            case 5:
+            case 6:
               res = _context.sent;
               _res = (res === null || res === void 0 ? void 0 : res.total) ? res === null || res === void 0 ? void 0 : res.list : res;
               totalRef.current = res === null || res === void 0 ? void 0 : res.total;
 
               if (!(_res && _res.length > 0)) {
-                _context.next = 12;
+                _context.next = 13;
                 break;
               }
 
@@ -103,11 +135,11 @@ function Index(props) {
                 }
               }));
 
-            case 12:
+            case 13:
               console.warn("".concat(_url, " is not return success result"));
               return _context.abrupt("return", []);
 
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -151,7 +183,7 @@ function Index(props) {
     return processSelectOptionsData();
   }, [initEnumValue, myEnum, id]);
   var httpOptions = useAsyncMemo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var _extraInfo$http, _extraInfo$http2, res;
+    var _extraInfo$http2, _extraInfo$http3, res;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -163,12 +195,12 @@ function Index(props) {
             }
 
             _context2.next = 3;
-            return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '', (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.isPagination) && pageRef.current);
+            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);
 
           case 3:
             res = _context2.sent;
 
-            if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http2 = extraInfo.http) === null || _extraInfo$http2 === void 0 ? void 0 : _extraInfo$http2.isCascader) {
+            if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isCascader) {
               setCascaderOption(_toConsumableArray(res));
             }
 
@@ -183,7 +215,7 @@ function Index(props) {
         }
       }
     }, _callee2);
-  })), [extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http]);
+  })), [extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http, watchValue]);
 
   var loadData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(selectedOptions) {
@@ -270,6 +302,24 @@ function Index(props) {
         },
         allowClear: true
       });
+    } else if (extraInfo.type === 'checkbox') {
+      return (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? /*#__PURE__*/React.createElement(_Checkbox.Group, {
+        style: {
+          width: '100%'
+        }
+      }, (httpOptions && httpOptions.length > 0 ? httpOptions : options).map(function (it) {
+        return /*#__PURE__*/React.createElement(_Checkbox, {
+          value: it.value
+        }, it.label);
+      })) : /*#__PURE__*/React.createElement(_Radio.Group, {
+        style: {
+          width: '100%'
+        }
+      }, (httpOptions && httpOptions.length > 0 ? httpOptions : options).map(function (it) {
+        return /*#__PURE__*/React.createElement(_Radio, {
+          value: it.value
+        }, it.label);
+      }));
     } else {
       var _extraInfo$disabled3;
 
@@ -294,7 +344,7 @@ function Index(props) {
   };
 
   if (isObj && isRefForm && field) {
-    var _extraInfo$http3, _extraInfo$http4;
+    var _extraInfo$http4, _extraInfo$http5;
 
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
@@ -309,7 +359,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$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isCascader, (_extraInfo$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isPagination));
+    }), 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));
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
@@ -325,7 +375,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.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+  }, 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, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -337,7 +387,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$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isCascader, (_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.isPagination));
 }
 
 export default /*#__PURE__*/React.memo(Index);

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -183,6 +183,8 @@ var TableArray = function TableArray(props) {
     var _columns = [];
 
     for (var i = 0; i < _properties.length; i++) {
+      var _extraInfo$disabled;
+
       var it = _properties[i];
       var extraInfo = refFieldsRef.current.get(it.id);
       var obj = {
@@ -190,7 +192,7 @@ var TableArray = function TableArray(props) {
         key: it.id,
         dataIndex: it.id,
         width: processColumnType(it, extraInfo) === 'buttonCell' ? 60 : 100,
-        editable: true,
+        editable: (_extraInfo$disabled = !extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : true,
         type: processColumnType(it, extraInfo),
         enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
       };

package/es/comps/MetadataForm/HOC/index.js

@@ -4,10 +4,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-10-09 17:12:36
+ * @LastEditTime: 2022-11-22 14:13:25
  */
 import React from 'react';
-import { deepClone } from '../../../utils';
+import { deepClone, guid } from '../../../utils';
 import './index.less';
 export function withAddOnAfter(WrappedComponent) {
   return function (props) {
@@ -48,7 +48,7 @@ export function withAddOnAfter(WrappedComponent) {
       key: "".concat(_name.toString(), "_div"),
       className: "with-add-on-after"
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
-      key: _name.toString()
+      key: "".concat(_name.toString(), "_Wrapped_").concat(guid())
     }, props, {
       style: {
         padding: '0px',

package/package.json

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