ronds-metadata 1.1.24 → 1.1.25

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

@@ -13,7 +13,7 @@ import Editable from '../../../../comps/Editable';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 import { MetadataFormContext } from '../../interface';
 import { getLabelByProps } from '../../utils';
-import { deepClone } from '@/utils';
+import { deepClone } from '../../../../utils';
 
 var TableArray = function TableArray(props) {
   var initValue = props.initValue,
@@ -125,18 +125,18 @@ var TableArray = function TableArray(props) {
       firstLoadRef.current = false;
     }
   }, [initValue, form]);
-  var processEnumData = React.useCallback(function (data) {
-    var _data$fields$, _data$fields$$value, _data$fields$$value$e;
+  var processEnumData = React.useCallback(function (data, _extraInfo) {
+    var _extraInfo$enum;
 
     var _options = [];
 
     var _enum = deepClone(data.enum || []); // 扩展规则的value
 
 
-    if (data === null || data === void 0 ? void 0 : (_data$fields$ = data.fields[0]) === null || _data$fields$ === void 0 ? void 0 : (_data$fields$$value = _data$fields$.value) === null || _data$fields$$value === void 0 ? void 0 : (_data$fields$$value$e = _data$fields$$value.enum) === null || _data$fields$$value$e === void 0 ? void 0 : _data$fields$$value$e.value) {
-      var _data$fields$2, _data$fields$2$value, _data$fields$2$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(data === null || data === void 0 ? void 0 : (_data$fields$2 = data.fields[0]) === null || _data$fields$2 === void 0 ? void 0 : (_data$fields$2$value = _data$fields$2.value) === null || _data$fields$2$value === void 0 ? void 0 : (_data$fields$2$value$ = _data$fields$2$value.enum) === null || _data$fields$2$value$ === void 0 ? void 0 : _data$fields$2$value$.value);
+      _enum = deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum2 = _extraInfo.enum) === null || _extraInfo$enum2 === void 0 ? void 0 : _extraInfo$enum2.value);
     }
 
     _enum.forEach(function (it) {
@@ -150,12 +150,21 @@ var TableArray = function TableArray(props) {
 
     return _options;
   }, []);
+  var processColumnType = React.useCallback(function (data, _extraInfo) {
+    var _extraInfo$text;
+
+    if (data.type === 'text' && ((_extraInfo$text = _extraInfo.text) === null || _extraInfo$text === void 0 ? void 0 : _extraInfo$text.type)) {
+      var _extraInfo$text2;
+
+      return (_extraInfo$text2 = _extraInfo.text) === null || _extraInfo$text2 === void 0 ? void 0 : _extraInfo$text2.type;
+    }
+
+    return data.type;
+  }, []);
   var processSchemaToColumns = React.useCallback(function (_properties) {
     var _columns = [];
 
     for (var i = 0; i < _properties.length; i++) {
-      var _extraInfo$text;
-
       var it = _properties[i];
       var extraInfo = refFieldsRef.current.get(it.id);
       var obj = {
@@ -164,8 +173,8 @@ var TableArray = function TableArray(props) {
         dataIndex: it.id,
         width: 100,
         editable: true,
-        type: it.type === 'text' && (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$text = extraInfo.text) === null || _extraInfo$text === void 0 ? void 0 : _extraInfo$text.type) === 'colorPicker' ? 'colorPicker' : it.type,
-        enum: it.type === 'enum' ? processEnumData(it) : undefined
+        type: processColumnType(it, extraInfo),
+        enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
       };
 
       _columns.push(obj);

package/package.json

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