ronds-metadata 1.2.37 → 1.2.39

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

@@ -2,62 +2,54 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import "antd/es/tag/style";
 import _Tag from "antd/es/tag";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef } from 'react';
 import { MetadataService } from '../../../../framework/metadata/MetadataService';
 import { JsonMetadataProvider } from '../../../../framework/metadata';
 import Editable from '../../../../comps/Editable';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 import { MetadataFormContext } from '../../interface';
-import { assign, getLabelByProps } from '../../utils';
+import { assignReplace, getLabelByProps } from '../../utils';
 import { deepClone, getConstantValue } from '../../../../utils';
 import { STREAM_EVENT_TYPE } from '../../constants';
-
 var TableArray = function TableArray(props) {
   var initValue = props.initValue,
-      readonly = props.readonly,
-      extraInfo = props.extraInfo,
-      rowNumber = props.rowNumber,
-      initEnumValue = props.initEnumValue,
-      addButtonHidden = props.addButtonHidden,
-      name = props.name,
-      form = props.form,
-      refId = props.refId;
+    readonly = props.readonly,
+    extraInfo = props.extraInfo,
+    rowNumber = props.rowNumber,
+    initEnumValue = props.initEnumValue,
+    addButtonHidden = props.addButtonHidden,
+    name = props.name,
+    form = props.form,
+    refId = props.refId;
   var formContext = React.useContext(MetadataFormContext) || {};
-
   var _React$useState = React.useState([]),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      schema = _React$useState2[0],
-      setSchema = _React$useState2[1];
-
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    schema = _React$useState2[0],
+    setSchema = _React$useState2[1];
   var _React$useState3 = React.useState({}),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      defaultValue = _React$useState4[0],
-      setDefaultValue = _React$useState4[1];
-
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    defaultValue = _React$useState4[0],
+    setDefaultValue = _React$useState4[1];
   var _React$useState5 = React.useState({}),
-      _React$useState6 = _slicedToArray(_React$useState5, 2),
-      refFields = _React$useState6[0],
-      setRefFields = _React$useState6[1];
-
+    _React$useState6 = _slicedToArray(_React$useState5, 2),
+    refFields = _React$useState6[0],
+    setRefFields = _React$useState6[1];
   var refFieldsRef = React.useRef(refFields);
   var firstLoadRef = useRef(true);
-
   var _React$useState7 = React.useState(),
-      _React$useState8 = _slicedToArray(_React$useState7, 2),
-      tblStream = _React$useState8[0],
-      setTblStream = _React$useState8[1];
-
+    _React$useState8 = _slicedToArray(_React$useState7, 2),
+    tblStream = _React$useState8[0],
+    setTblStream = _React$useState8[1];
   var _React$useState9 = React.useState([]),
-      _React$useState10 = _slicedToArray(_React$useState9, 2),
-      list = _React$useState10[0],
-      setList = _React$useState10[1];
-
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    list = _React$useState10[0],
+    setList = _React$useState10[1];
   var listRef = React.useRef([]);
   var enumOptionsRef = React.useRef({});
   useObservable(function (p) {
@@ -67,13 +59,10 @@ var TableArray = function TableArray(props) {
         listRef.current = p.payload[name];
       } else if (p.payload[name[0]]) {
         var evalString = 'p.payload';
-
         for (var i = 0; i < name.length; i++) {
           evalString = "".concat(evalString, "[name[").concat(i, "]]");
         }
-
         var _list = eval(evalString) || [];
-
         setList(_toConsumableArray(_list));
         listRef.current = _list;
       }
@@ -83,11 +72,9 @@ var TableArray = function TableArray(props) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
       if (typeof name === 'string') {
         var _p$payload;
-
         var val = _defineProperty({}, "".concat(name), _objectSpread({
           rowIdx: p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.rowIdx
         }, p.payload.values));
-
         var allVals = form.getFieldsValue();
         allVals[name] = listRef.current;
         formContext.stream$.next({
@@ -99,15 +86,12 @@ var TableArray = function TableArray(props) {
         });
       } else {
         var _p$payload2;
-
         var _val2 = {};
-
         var _allVals = form.getFieldsValue();
-
-        assign(name, _objectSpread({
+        assignReplace(name, _objectSpread({
           rowIdx: p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.rowIdx
         }, p.payload.values), _val2);
-        assign(name, _toConsumableArray(listRef.current), _allVals);
+        assignReplace(name, _toConsumableArray(listRef.current), _allVals);
         formContext.stream$.next({
           type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
           payload: {
@@ -121,57 +105,45 @@ var TableArray = function TableArray(props) {
   var getSchemaByRefId = React.useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(server, __TYPE__) {
       var _schema, res, provider, FormCls, formCls, _fields;
-
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _schema = []; // 如果有内部类，优先在内部类里面找
-
-              if (__TYPE__.length > 0) {
-                _schema = __TYPE__.filter(function (it) {
-                  return it.id === refId;
-                });
-              } // 内部类找不到 从接口里面拿
-
-
-              if (!(_schema.length === 0)) {
-                _context.next = 7;
-                break;
-              }
-
-              _context.next = 5;
-              return server.GetMetadataDetailById(refId);
-
-            case 5:
-              res = _context.sent;
-
-              if (res === null || res === void 0 ? void 0 : res.schema) {
-                _schema = JSON.parse(res === null || res === void 0 ? void 0 : res.schema);
-              }
-
-            case 7:
-              provider = new JsonMetadataProvider();
-
-              if (_schema.length > 0) {
-                provider.add_types(_schema);
-                FormCls = provider.get_type(_schema[0].id);
-                formCls = new FormCls();
-                _fields = formCls.__type__.__fields__;
-                refFieldsRef.current = _fields;
-                setRefFields(_objectSpread({}, _fields));
-                setSchema(_toConsumableArray(_schema));
-                setDefaultValue(_objectSpread({}, JSON.parse(JSON.stringify(formCls))));
-              }
-
-            case 9:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _schema = []; // 如果有内部类，优先在内部类里面找
+            if (__TYPE__.length > 0) {
+              _schema = __TYPE__.filter(function (it) {
+                return it.id === refId;
+              });
+            }
+            // 内部类找不到 从接口里面拿
+            if (!(_schema.length === 0)) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 5;
+            return server.GetMetadataDetailById(refId);
+          case 5:
+            res = _context.sent;
+            if (res === null || res === void 0 ? void 0 : res.schema) {
+              _schema = JSON.parse(res === null || res === void 0 ? void 0 : res.schema);
+            }
+          case 7:
+            provider = new JsonMetadataProvider();
+            if (_schema.length > 0) {
+              provider.add_types(_schema);
+              FormCls = provider.get_type(_schema[0].id);
+              formCls = new FormCls();
+              _fields = formCls.__type__.__fields__;
+              refFieldsRef.current = _fields;
+              setRefFields(_objectSpread({}, _fields));
+              setSchema(_toConsumableArray(_schema));
+              setDefaultValue(_objectSpread({}, JSON.parse(JSON.stringify(formCls))));
+            }
+          case 9:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
-
     return function (_x, _x2) {
       return _ref.apply(this, arguments);
     };
@@ -184,7 +156,6 @@ var TableArray = function TableArray(props) {
         server = null;
       };
     }
-
     return function () {};
   }, [refId]);
   React.useEffect(function () {
@@ -201,121 +172,93 @@ var TableArray = function TableArray(props) {
         listRef.current = initValue[name];
       } else if (initValue[name[0]]) {
         var evalString = 'initValue';
-
         for (var i = 0; i < name.length; i++) {
           evalString = "".concat(evalString, "[name[").concat(i, "]]");
         }
-
         var _list = eval(evalString);
-
         setList(_toConsumableArray(_list));
         listRef.current = _list;
       }
-
       firstLoadRef.current = false;
     }
   }, [initValue, form]);
   var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(http) {
       var server, _url, res, _res;
-
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              server = new MetadataService();
-              _url = http.url;
-              _context2.next = 4;
-              return server.GetEnumDataByUrl(_url, http.method, (http === null || http === void 0 ? void 0 : http.body) && JSON.parse(http === null || http === void 0 ? void 0 : http.body));
-
-            case 4:
-              res = _context2.sent;
-              _res = (res === null || res === void 0 ? void 0 : res.total) ? res === null || res === void 0 ? void 0 : res.list : res;
-
-              if (!(_res && _res.length > 0)) {
-                _context2.next = 10;
-                break;
-              }
-
-              return _context2.abrupt("return", _res.map(function (it) {
-                return {
-                  value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
-                  label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
-                  disabled: false
-                };
-              }));
-
-            case 10:
-              console.warn("".concat(_url, " is not return success result"));
-              return _context2.abrupt("return", []);
-
-            case 12:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            server = new MetadataService();
+            _url = http.url;
+            _context2.next = 4;
+            return server.GetEnumDataByUrl(_url, http.method, (http === null || http === void 0 ? void 0 : http.body) && JSON.parse(http === null || http === void 0 ? void 0 : http.body));
+          case 4:
+            res = _context2.sent;
+            _res = (res === null || res === void 0 ? void 0 : res.total) ? res === null || res === void 0 ? void 0 : res.list : res;
+            if (!(_res && _res.length > 0)) {
+              _context2.next = 10;
+              break;
+            }
+            return _context2.abrupt("return", _res.map(function (it) {
+              return {
+                value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                disabled: false
+              };
+            }));
+          case 10:
+            console.warn("".concat(_url, " is not return success result"));
+            return _context2.abrupt("return", []);
+          case 12:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
-
     return function (_x3) {
       return _ref2.apply(this, arguments);
     };
   }(), []);
   var processEnumData = React.useCallback(function (data, _extraInfo) {
     var _extraInfo$enum, _extraInfo$enum3, _extraInfo$enum3$http;
-
     var _options = [];
-
-    var _enum = deepClone(data.enum || []); // 扩展规则的value
-
-
+    var _enum = deepClone(data.enum || []);
+    // 扩展规则的value
     if (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum = _extraInfo.enum) === null || _extraInfo$enum === void 0 ? void 0 : _extraInfo$enum.value) {
       var _extraInfo$enum2;
-
       _enum = deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum2 = _extraInfo.enum) === null || _extraInfo$enum2 === void 0 ? void 0 : _extraInfo$enum2.value);
-    } // 从接口拿数据
-
-
+    }
+    // 从接口拿数据
     if (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum3 = _extraInfo.enum) === null || _extraInfo$enum3 === void 0 ? void 0 : (_extraInfo$enum3$http = _extraInfo$enum3.http) === null || _extraInfo$enum3$http === void 0 ? void 0 : _extraInfo$enum3$http.url) {
       var _extraInfo$enum4;
-
       return getEnumDataByUrl(deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum4 = _extraInfo.enum) === null || _extraInfo$enum4 === void 0 ? void 0 : _extraInfo$enum4.http));
-    } // 目前是更具那么的id判断的，暂未考虑重名问题
-
-
+    }
+    // 目前是更具那么的id判断的，暂未考虑重名问题
     if (initEnumValue && initEnumValue[data.id]) {
       _enum = deepClone(initEnumValue[data.id]);
     }
-
     _enum.forEach(function (it) {
       var obj = {
         label: it.value,
         value: (it === null || it === void 0 ? void 0 : it.key) || (it === null || it === void 0 ? void 0 : it.value)
       };
-
       _options.push(obj);
     });
-
     enumOptionsRef.current[data.id] = _options;
     return _options;
   }, []);
   var processColumnType = React.useCallback(function (data, _extraInfo) {
     var _extraInfo$text, _extraInfo$text2;
-
     if ((data === null || data === void 0 ? void 0 : data.type) === 'text' && (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$text = _extraInfo.text) === null || _extraInfo$text === void 0 ? void 0 : _extraInfo$text.type) && (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$text2 = _extraInfo.text) === null || _extraInfo$text2 === void 0 ? void 0 : _extraInfo$text2.type) !== 'textarea') {
       var _extraInfo$text3;
-
       return (_extraInfo$text3 = _extraInfo.text) === null || _extraInfo$text3 === void 0 ? void 0 : _extraInfo$text3.type;
     }
-
     return data.type;
   }, []);
   var processSchemaToColumns = React.useCallback(function (_properties) {
     var _columns = [];
-
-    var _loop = function _loop(i) {
+    var _loop = function _loop() {
       var _extraInfo$common, _extraInfo$enum5;
-
       var it = _properties[i];
       var extraInfo = refFieldsRef.current.get(it.id);
       var obj = {
@@ -336,33 +279,25 @@ var TableArray = function TableArray(props) {
                 }, getConstantValue(enumOptionsRef.current[it.id], v, 'value', 'label'));
               });
             }
-
             return getConstantValue(enumOptionsRef.current[it.id], val, 'value', 'label');
           }
-
           return val;
         }
       };
-
       _columns.push(obj);
     };
-
     for (var i = 0; i < _properties.length; i++) {
-      _loop(i);
+      _loop();
     }
-
     return _columns;
   }, []);
   var columns = React.useMemo(function () {
     var _columns = [];
-
     if (schema.length > 0) {
       _columns = processSchemaToColumns(schema[0].properties);
     }
-
     return _columns;
   }, [schema, processSchemaToColumns]);
-
   var onTableChange = function onTableChange(values) {
     if (typeof name === 'string') {
       var allVals = form.getFieldsValue();
@@ -377,11 +312,9 @@ var TableArray = function TableArray(props) {
       form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
     } else {
       var val = {};
-      assign(name, _toConsumableArray(values), val);
-
+      assignReplace(name, _toConsumableArray(values), val);
       var _allVals2 = form.getFieldsValue();
-
-      assign(name, _toConsumableArray(values), _allVals2);
+      assignReplace(name, _toConsumableArray(values), _allVals2);
       formContext.stream$.next({
         type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
         payload: {
@@ -391,17 +324,14 @@ var TableArray = function TableArray(props) {
       });
       form.setFieldsValue(_objectSpread({}, val));
     }
-
     listRef.current = values;
   };
-
   var onButtonCellClick = function onButtonCellClick(record) {
     formContext.stream$.next({
       type: 'onButtonCellClick',
       payload: record
     });
   };
-
   var getCellHeight = React.useCallback(function (_readonly) {
     return _readonly ? 30 : 33;
   }, []);
@@ -440,5 +370,4 @@ var TableArray = function TableArray(props) {
     }
   })));
 };
-
 export default TableArray;

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

@@ -2,6 +2,11 @@ import "antd/es/col/style";
 import _Col from "antd/es/col";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2023-04-18 10:15:35
+ */
 import React from 'react';
 import { deepClone } from '../../../utils';
 import { useWatchDepend } from '../hooks';
@@ -10,43 +15,34 @@ import './index.less';
 export function withAddOnAfter(WrappedComponent) {
   return function (props) {
     var _fields$, _fields$$value, _fields$$value$common, _fields$4, _fields$4$value, _fields$4$value$commo, _fields$4$value$commo2, _fields$5, _fields$5$value, _fields$5$value$commo;
-
     var type = props.type,
-        refId = props.refId,
-        isShowTypeInfo = props.isShowTypeInfo,
-        fields = props.fields,
-        colSpan = props.colSpan,
-        field = props.field,
-        id = props.id,
-        _props$name = props.name,
-        name = _props$name === void 0 ? [] : _props$name,
-        isObj = props.isObj;
+      refId = props.refId,
+      isShowTypeInfo = props.isShowTypeInfo,
+      fields = props.fields,
+      colSpan = props.colSpan,
+      field = props.field,
+      id = props.id,
+      _props$name = props.name,
+      name = _props$name === void 0 ? [] : _props$name,
+      isObj = props.isObj;
     var formContext = React.useContext(MetadataFormContext) || {};
     var depend = useWatchDepend(fields && ((_fields$ = fields[0]) === null || _fields$ === void 0 ? void 0 : (_fields$$value = _fields$.value) === null || _fields$$value === void 0 ? void 0 : (_fields$$value$common = _fields$$value.common) === null || _fields$$value$common === void 0 ? void 0 : _fields$$value$common.depend), formContext === null || formContext === void 0 ? void 0 : formContext.stream$, name);
-
     var _React$useState = React.useState(),
-        _React$useState2 = _slicedToArray(_React$useState, 2),
-        help = _React$useState2[0],
-        setHelp = _React$useState2[1];
-
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      help = _React$useState2[0],
+      setHelp = _React$useState2[1];
     var _React$useState3 = React.useState(),
-        _React$useState4 = _slicedToArray(_React$useState3, 2),
-        cellColSpan = _React$useState4[0],
-        setCellColSpan = _React$useState4[1];
-
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      cellColSpan = _React$useState4[0],
+      setCellColSpan = _React$useState4[1];
     var labelSpan = React.useMemo(function () {
       var _fields$0$value, _fields$0$value$commo;
-
       var _labelSpan = formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan;
-
       var _colSpan = fields && ((_fields$0$value = fields[0].value) === null || _fields$0$value === void 0 ? void 0 : (_fields$0$value$commo = _fields$0$value.common) === null || _fields$0$value$commo === void 0 ? void 0 : _fields$0$value$commo.colSpan);
-
       var _formLabelSpan = formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan;
-
       if (_colSpan && _formLabelSpan) {
         _labelSpan = _formLabelSpan / _colSpan;
       }
-
       return _labelSpan;
     }, [fields, formContext === null || formContext === void 0 ? void 0 : formContext.colSpan, formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan]);
     React.useEffect(function () {
@@ -54,52 +50,39 @@ export function withAddOnAfter(WrappedComponent) {
         var arr = refId.split(':');
         setHelp(arr[arr.length - 1]);
       }
-
       return function () {};
     }, [refId]);
     React.useEffect(function () {
       var _fields$2, _fields$2$value, _fields$2$value$commo, _fields$3, _fields$3$value;
-
       var _colSpan = colSpan;
       var compColSpan = fields && (((_fields$2 = fields[0]) === null || _fields$2 === void 0 ? void 0 : (_fields$2$value = _fields$2.value) === null || _fields$2$value === void 0 ? void 0 : (_fields$2$value$commo = _fields$2$value.common) === null || _fields$2$value$commo === void 0 ? void 0 : _fields$2$value$commo.colSpan) || ((_fields$3 = fields[0]) === null || _fields$3 === void 0 ? void 0 : (_fields$3$value = _fields$3.value) === null || _fields$3$value === void 0 ? void 0 : _fields$3$value.colSpan));
-
       if (compColSpan) {
         _colSpan = compColSpan * colSpan <= 24 ? compColSpan * colSpan : 24;
       }
-
       setCellColSpan(_colSpan);
     }, [fields, colSpan]);
-
     var _name = React.useMemo(function () {
       if (id && name.length > 0 && !field) {
         var res = deepClone(name);
         res.push(id);
         return res;
       }
-
       if (id && name.length > 0 && field) {
         var _res = deepClone(name);
-
         _res.push(id);
-
         if (type !== 'ref') {
           _res.shift();
         }
-
         return _res;
       }
-
       return [id];
     }, [id, name]);
-
     if (depend === null || depend === void 0 ? void 0 : depend.hidden) {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     }
-
     if (fields && ((_fields$4 = fields[0]) === null || _fields$4 === void 0 ? void 0 : (_fields$4$value = _fields$4.value) === null || _fields$4$value === void 0 ? void 0 : (_fields$4$value$commo = _fields$4$value.common) === null || _fields$4$value$commo === void 0 ? void 0 : (_fields$4$value$commo2 = _fields$4$value$commo.depend) === null || _fields$4$value$commo2 === void 0 ? void 0 : _fields$4$value$commo2.show) && !(depend === null || depend === void 0 ? void 0 : depend.show)) {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     }
-
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Col, {
       key: id,
       span: cellColSpan