ronds-metadata 1.0.88 → 1.0.91

package/es/comps/Editable/DataCell/Input.js

@@ -6,7 +6,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-10 14:38:32
+ * @LastEditTime: 2022-05-12 11:06:36
  */
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -46,6 +46,7 @@ function Index(props) {
     }
   }, /*#__PURE__*/React.createElement(_Input, {
     ref: inputRef,
+    size: "small",
     disabled: editConfig.type === 'edit' ? disabled : false
   }));
 }

package/es/comps/Editable/DataCell/Number.js

@@ -35,6 +35,7 @@ function Index(props) {
       margin: 0
     }
   }, /*#__PURE__*/React.createElement(_InputNumber, {
+    size: "small",
     ref: inputRef,
     disabled: editConfig.type === 'edit' ? disabled : false
   }));

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

@@ -8,7 +8,7 @@ var _excluded = ["dataIndex", "disabled"];
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-08 14:14:18
+ * @LastEditTime: 2022-05-12 11:07:04
  */
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -28,6 +28,7 @@ function Index(props) {
     }
   }, /*#__PURE__*/React.createElement(_Select, {
     disabled: editConfig.type === 'edit' ? disabled : false,
+    size: "small",
     style: {
       width: '100%'
     },

package/es/comps/Editable/DataCell/Switch.js

@@ -6,7 +6,7 @@ import _Switch from "antd/es/switch";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-08 14:14:22
+ * @LastEditTime: 2022-05-12 11:07:09
  */
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -25,6 +25,7 @@ function Index(props) {
       margin: 0
     }
   }, /*#__PURE__*/React.createElement(_Switch, {
+    size: "small",
     disabled: editConfig.type === 'edit' ? disabled : false
   }));
 }

package/es/comps/Editable/comps/EditableCell.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["title", "isAddColumn", "editable", "record", "editableType", "dataIndex", "rowIndex", "children"];
+var _excluded = ["title", "isAddColumn", "editable", "record", "editableType", "dataIndex", "rowIndex", "children", "className"];
 import React from 'react';
 import { EditableContext } from '../interface';
 import { getDataCell, isFreeEditCell, isFreeEditRow } from '../utils';
@@ -19,6 +19,7 @@ var EditableCell = function EditableCell(props) {
       dataIndex = props.dataIndex,
       rowIndex = props.rowIndex,
       children = props.children,
+      className = props.className,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _ref = React.useContext(EditableContext) || undefined,
@@ -62,7 +63,7 @@ var EditableCell = function EditableCell(props) {
 
   if (restProps === null || restProps === void 0 ? void 0 : restProps.colSpan) {
     return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
-      className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " "),
+      className: "".concat(className, " ").concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " "),
       style: {
         border: 0
       }
@@ -71,7 +72,7 @@ var EditableCell = function EditableCell(props) {
 
   if (editableType === 'single') {
     return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
-      className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
+      className: "".concat(className, " ").concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
     }), editable && editConfig.curRow === rowIndex ? getDataCell(props) : /*#__PURE__*/React.createElement(Texty, {
       tooltipStyle: {
         wordWrap: 'break-word'
@@ -85,7 +86,7 @@ var EditableCell = function EditableCell(props) {
       onDoubleClick: onCellDoubleClick,
       onClick: onCellClick
     }, restProps, {
-      className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
+      className: "".concat(className, " ").concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
     }), editable && (isFreeEditRow(editConfig.curRow, rowIndex) || isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) ? getDataCell(props) : /*#__PURE__*/React.createElement(Texty, {
       tooltipStyle: {
         wordWrap: 'break-word'
@@ -95,7 +96,7 @@ var EditableCell = function EditableCell(props) {
   }
 
   return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
-    className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
+    className: "".concat(className, " ").concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
   }), editable ? getDataCell(props) : /*#__PURE__*/React.createElement(Texty, {
     tooltipStyle: {
       wordWrap: 'break-word'

package/es/comps/Editable/comps/EditableHeardCell.js

@@ -10,7 +10,7 @@ import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["title", "dataIndex", "isAddColumn", "children"];
+var _excluded = ["title", "dataIndex", "isAddColumn", "children", "className"];
 import { PlusSquareOutlined, DeleteOutlined } from '@ant-design/icons';
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -23,6 +23,7 @@ var EditableHeardCell = function EditableHeardCell(props) {
       dataIndex = props.dataIndex,
       isAddColumn = props.isAddColumn,
       children = props.children,
+      className = props.className,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _ref = React.useContext(EditableContext) || undefined,
@@ -129,7 +130,7 @@ var EditableHeardCell = function EditableHeardCell(props) {
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("th", _extends({}, restProps, {
-    className: "ant-table-th font-bold ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right ' : '', " ")
+    className: "".concat(className, " ant-table-th font-bold ").concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right ' : '', " ")
   }), isAddColumn && /*#__PURE__*/React.createElement(_Popover, {
     placement: "rightTop",
     content: content,

package/es/comps/Editable/index.css

@@ -2,6 +2,9 @@
   width: 100%;
   height: 100%;
 }
+.ronds-edit-table table {
+  border-collapse: collapse !important;
+}
 .ronds-edit-table .ant-spin-nested-loading,
 .ronds-edit-table .ant-spin-container,
 .ronds-edit-table .ant-table,
@@ -15,7 +18,12 @@
   height: 30px;
   padding: 0px 8px !important;
 }
+.ronds-edit-table .ant-table-cell-fix-right {
+  position: sticky !important;
+  right: 0 !important;
+}
 .ronds-edit-table .ant-table-body {
+  height: 100%;
   overflow-y: auto !important;
 }
 .ronds-edit-table .ant-table.ant-table-small .ant-table-thead > tr > th {
@@ -37,3 +45,26 @@
   padding: 0% !important;
   margin: 0% !important;
 }
+.ronds-edit-table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-body > table > tbody > tr > td > .ant-table-expanded-row-fixed::after {
+  border-right: 0 !important;
+}
+.ronds-metadata-normal .ant-table {
+  border-right: 1px solid #f0f0f0 !important;
+}
+.ronds-metadata-normal .ant-table .ant-table-row--odd {
+  background-color: #ebebeb !important;
+}
+.ronds-metadata-normal .ant-table .ant-table-row--odd .ant-table-cell {
+  background-color: #ebebeb !important;
+}
+.ronds-metadata-normal .ant-table .ant-table-expanded-row-fixed::after {
+  border: 0 !important;
+}
+.ronds-metadata-normal .ant-table .ant-table-placeholder {
+  pointer-events: none;
+  background-color: #fff !important;
+}
+.ronds-metadata-normal .ant-table .ant-table-placeholder .ant-table-cell {
+  padding: 0 !important;
+  background-color: #fff !important;
+}

package/es/comps/Editable/index.js

@@ -169,6 +169,7 @@ var Editable = function Editable(props) {
 
           setRecords(_toConsumableArray(_records3));
           recordsRef.current = _records3;
+          onMulChange && onMulChange(_records3);
         }
 
         if (type === 'freedom') {
@@ -276,9 +277,7 @@ var Editable = function Editable(props) {
           rowIndex: rowIndex
         });
       };
-    }
 
-    if (isAddColumn) {
       _column.onHeaderCell = function (col) {
         return _objectSpread({
           width: col.width,
@@ -299,9 +298,9 @@ var Editable = function Editable(props) {
       var _aciton_ = {
         dataKey: '_aciton_',
         title: tr('操作'),
-        width: 40,
+        width: type === 'multiple' ? 50 : 100,
         ellipsis: true,
-        fixed: 'left',
+        fixed: 'right',
         render: function render(val, record) {
           return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditableAction, {
             type: type,

package/es/comps/MetadataEdit/components/MetaFieldsEdit.js

@@ -288,7 +288,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
       var _defaultValues$index;
 
       return /*#__PURE__*/React.createElement("div", {
-        key: field.key
+        key: "".concat(field.key)
       }, /*#__PURE__*/React.createElement("div", {
         style: {
           display: 'flex',
@@ -388,13 +388,14 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         }
       }))), (refIds[index] || refSchema[index]) && /*#__PURE__*/React.createElement("div", {
         style: {
-          border: 'var(--ronds-metadata-color-border-1)',
+          border: '1px solid var(--ronds-metadata-color-border-1)',
           padding: '10px',
           marginBottom: '10px'
         }
       }, /*#__PURE__*/React.createElement(MetadataForm, {
         initialValues: defaultValues && defaultValues.length > 0 && ((_defaultValues$index = defaultValues[index]) === null || _defaultValues$index === void 0 ? void 0 : _defaultValues$index.value),
         refId: refIds[index],
+        isFoldForm: true,
         schema: refSchema[index],
         onValuesChange: function onValuesChange(values, allValues) {
           onRefRulesValuesChange(allValues, index);

package/es/comps/MetadataEdit/components/MetaPropsEdit.js

@@ -62,6 +62,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           alignItems: 'flex-end'
         }
       }, /*#__PURE__*/React.createElement(_Form.Item, _extends({
+        key: field.key,
         className: "pr-10"
       }, field, {
         label: "\u5C5E\u6027\u540D\u79F0",
@@ -70,7 +71,9 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
         rules: [{
           required: true
         }]
-      }), /*#__PURE__*/React.createElement(_Input, null)), /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+      }), /*#__PURE__*/React.createElement(_Input, null)), /*#__PURE__*/React.createElement(_Form.Item, _extends({
+        key: field.key
+      }, field, {
         label: "\u5C5E\u6027\u7C7B\u578B",
         name: [field.name, 'type'],
         fieldKey: [field.fieldKey, 'type'],

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

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-11 10:59:56
+ * @LastEditTime: 2022-05-14 08:29:16
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -16,7 +16,8 @@ import { MetadataFormContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
 import { deepClone } from '../../../utils';
-import { tr } from '@/framework/locale';
+import { tr } from '../../../framework/locale';
+import TableArray from './layout/TableArray';
 
 function Index(props) {
   var _fieldRule$, _fieldRule$$value;
@@ -71,7 +72,12 @@ function Index(props) {
       top: '19px',
       background: '#fff'
     }
-  }, help || (items === null || items === void 0 ? void 0 : items.type))), /*#__PURE__*/React.createElement("div", {
+  }, help || (items === null || items === void 0 ? void 0 : items.type))), extraInfo.layout === 'table' && items.type === 'ref' ? /*#__PURE__*/React.createElement(TableArray, {
+    initValue: formContext.initialValues,
+    refId: items.refId,
+    form: formContext.form,
+    name: id
+  }) : /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '10px',
       border: '1px solid var(--ronds-metadata-color-border-1)',

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

@@ -8,21 +8,15 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
-import "antd/es/popover/style";
-import _Popover from "antd/es/popover";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-05 09:34:40
+ * @LastEditTime: 2022-05-16 09:24:21
  */
 import React from 'react';
-import { BgColorsOutlined } from '@ant-design/icons';
-import { SketchPicker } from 'react-color';
 import { UploadOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
@@ -39,27 +33,6 @@ function Index(props) {
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
-  var _React$useState = React.useState(''),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      color = _React$useState2[0],
-      setColor = _React$useState2[1];
-
-  React.useEffect(function () {
-    if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) === 'colorPicker') {
-      setColor(formContext.form.getFieldValue(id));
-    }
-  }, [extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type, formContext.form]);
-
-  var onColorChange = function onColorChange(e) {
-    formContext.form.setFieldsValue(_defineProperty({}, id, e.hex));
-    setColor(e.hex);
-  };
-
-  var colorPicker = /*#__PURE__*/React.createElement(SketchPicker, {
-    color: color,
-    onChange: onColorChange
-  });
-
   var processInputType = function processInputType(_type) {
     var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$disabled5;
 
@@ -78,22 +51,11 @@ function Index(props) {
         });
 
       case 'colorPicker':
-        return /*#__PURE__*/React.createElement("div", {
-          className: "flex relative"
-        }, /*#__PURE__*/React.createElement(_Input, {
-          value: color,
+        return /*#__PURE__*/React.createElement(_Input, {
+          type: "color",
           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
-        }), /*#__PURE__*/React.createElement("div", {
-          style: {
-            position: 'absolute',
-            right: '5px',
-            top: '5px',
-            zIndex: 888
-          }
-        }, /*#__PURE__*/React.createElement(_Popover, {
-          content: colorPicker
-        }, /*#__PURE__*/React.createElement(BgColorsOutlined, null))));
+        });
 
       case 'datePicker':
         return /*#__PURE__*/React.createElement(_DatePicker, {
@@ -136,6 +98,11 @@ function Index(props) {
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
+    key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    initialValue: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    style: {
+      display: "".concat(extraInfo.hidden ? 'none' : 'block')
+    },
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: name,
     rules: [{

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

@@ -44,6 +44,11 @@ function Index(props) {
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
+    key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    initialValue: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    style: {
+      display: "".concat(extraInfo.hidden ? 'none' : 'block')
+    },
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: name,
     rules: [{

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

@@ -3,12 +3,15 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
+import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
@@ -26,29 +29,34 @@ function Index(props) {
       field = props.field,
       name = props.name;
   var formContext = React.useContext(MetadataFormContext) || {};
-  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form, props.type);
+  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form, props.type); // 是否折叠
 
-  var _React$useState = React.useState([]),
+  var _React$useState = React.useState(true),
       _React$useState2 = _slicedToArray(_React$useState, 2),
-      schema = _React$useState2[0],
-      setSchema = _React$useState2[1];
+      isFold = _React$useState2[0],
+      setIsFold = _React$useState2[1];
 
-  var _React$useState3 = React.useState({}),
+  var _React$useState3 = React.useState([]),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      refFields = _React$useState4[0],
-      setRefFields = _React$useState4[1];
+      schema = _React$useState4[0],
+      setSchema = _React$useState4[1];
 
-  var refFieldsRef = React.useRef(refFields);
-
-  var _React$useState5 = React.useState([]),
+  var _React$useState5 = React.useState({}),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
-      options = _React$useState6[0],
-      setOptions = _React$useState6[1];
+      refFields = _React$useState6[0],
+      setRefFields = _React$useState6[1];
 
-  var _React$useState7 = React.useState(''),
+  var refFieldsRef = React.useRef(refFields);
+
+  var _React$useState7 = React.useState([]),
       _React$useState8 = _slicedToArray(_React$useState7, 2),
-      help = _React$useState8[0],
-      setHelp = _React$useState8[1];
+      options = _React$useState8[0],
+      setOptions = _React$useState8[1];
+
+  var _React$useState9 = React.useState(''),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      help = _React$useState10[0],
+      setHelp = _React$useState10[1];
 
   var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var param, server, res, _options, i, obj;
@@ -148,19 +156,32 @@ function Index(props) {
 
   if (isRefForm && !field && schema.length > 0) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
       className: "ant-form-item-label",
       style: {
         width: '100%',
-        textAlign: 'left'
+        textAlign: 'left',
+        flex: '1'
       }
     }, /*#__PURE__*/React.createElement("label", {
       className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
-    }, extraInfo.label || id)), /*#__PURE__*/React.createElement("div", {
+    }, extraInfo.label || id)), formContext.isFoldForm && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+      type: "link",
+      onClick: function onClick() {
+        setIsFold(!isFold);
+      },
+      icon: isFold ? /*#__PURE__*/React.createElement(CaretDownOutlined, null) : /*#__PURE__*/React.createElement(CaretUpOutlined, null)
+    }))), /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',
         border: '1px solid var(--ronds-metadata-color-border-1)',
         width: '100%',
-        borderRadius: '4px'
+        borderRadius: '4px',
+        display: "".concat(isFold ? 'none' : 'block')
       }
     }, /*#__PURE__*/React.createElement(MetadataRefContext.Provider, {
       value: {
@@ -185,7 +206,12 @@ function Index(props) {
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
+    key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
+    initialValue: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    style: {
+      display: "".concat(extraInfo.hidden ? 'none' : 'block')
+    },
     name: id,
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require

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

@@ -9,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-10 16:14:43
+ * @LastEditTime: 2022-05-11 16:41:22
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -93,6 +93,11 @@ function Index(props) {
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
+    key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    initialValue: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    style: {
+      display: "".concat(extraInfo.hidden ? 'none' : 'block')
+    },
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: name,
     rules: [{

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

@@ -8,7 +8,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-05 09:37:53
+ * @LastEditTime: 2022-05-11 16:41:29
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -53,6 +53,11 @@ function Index(props) {
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
+    key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    initialValue: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
+    style: {
+      display: "".concat(extraInfo.hidden ? 'none' : 'block')
+    },
     name: name,
     valuePropName: "checked",
     rules: [{

package/es/comps/MetadataForm/DataCell/layout/TableArray.d.ts

@@ -0,0 +1,9 @@
+import { FormInstance } from 'antd';
+interface ITableArrayProps {
+    name: string;
+    form: FormInstance;
+    refId: string;
+    initValue: any;
+}
+declare const TableArray: (props: ITableArrayProps) => JSX.Element;
+export default TableArray;

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

@@ -0,0 +1,146 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useRef } from 'react';
+import { MetadataService } from '../../../../framework/metadata/MetadataService';
+import { JsonMetadataProvider } from '../../../../framework/metadata';
+import Editable from '../../../../comps/Editable';
+
+var TableArray = function TableArray(props) {
+  var initValue = props.initValue,
+      name = props.name,
+      form = props.form,
+      refId = props.refId;
+
+  var _React$useState = React.useState([]),
+      _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];
+
+  var _React$useState5 = React.useState({}),
+      _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),
+      list = _React$useState8[0],
+      setList = _React$useState8[1];
+
+  React.useEffect(function () {
+    if (refId) {
+      var server = new MetadataService();
+      server.GetMetadataDetailById(refId).then(function (res) {
+        var provider = new JsonMetadataProvider();
+
+        if (res === null || res === void 0 ? void 0 : res.schema) {
+          var mySchema = JSON.parse(res.schema);
+          provider.add_types(mySchema);
+          var FormCls = provider.get_type(mySchema[0].id);
+          var formCls = new FormCls();
+          var _fields = formCls.__type__.__fields__;
+          refFieldsRef.current = _fields;
+          setRefFields(_objectSpread({}, _fields));
+          setSchema(_toConsumableArray(mySchema));
+          setDefaultValue(_objectSpread({}, JSON.parse(JSON.stringify(formCls))));
+          return function () {
+            provider = null;
+          };
+        }
+
+        return function () {
+          provider = null;
+        };
+      });
+      return function () {
+        server = null;
+      };
+    }
+
+    return function () {};
+  }, [refId]);
+  React.useEffect(function () {
+    if (initValue && firstLoadRef.current) {
+      setList(_toConsumableArray(initValue[name]));
+      firstLoadRef.current = false;
+    }
+  }, [initValue, form]);
+  var processSchemaToColumns = React.useCallback(function (_properties) {
+    var _columns = [];
+
+    for (var i = 0; i < _properties.length; i++) {
+      var _it$fields$0$value, _it$fields$0$value$co, _it$fields$0$value2;
+
+      var it = _properties[i];
+      var obj = {
+        title: (it === null || it === void 0 ? void 0 : (_it$fields$0$value = it.fields[0].value) === null || _it$fields$0$value === void 0 ? void 0 : (_it$fields$0$value$co = _it$fields$0$value.common) === null || _it$fields$0$value$co === void 0 ? void 0 : _it$fields$0$value$co.label) || (it === null || it === void 0 ? void 0 : (_it$fields$0$value2 = it.fields[0].value) === null || _it$fields$0$value2 === void 0 ? void 0 : _it$fields$0$value2.label) || it.id,
+        key: it.id,
+        dataIndex: it.id,
+        width: 100,
+        editable: true,
+        type: it.type,
+        enum: it.type === 'enum' ? it.enum.map(function (v) {
+          return {
+            label: v.value,
+            value: v.value
+          };
+        }) : undefined
+      };
+
+      _columns.push(obj);
+    }
+
+    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) {
+    form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%',
+      height: '340px'
+    }
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    name: name,
+    style: {
+      margin: 0
+    }
+  }, /*#__PURE__*/React.createElement(Editable, {
+    type: "multiple",
+    defaultValue: defaultValue,
+    addPosition: "bottom",
+    columns: columns,
+    dataSource: list,
+    onMulChange: onTableChange,
+    tableProps: {
+      scroll: {
+        x: '100%',
+        y: '300px'
+      }
+    }
+  })));
+};
+
+export default TableArray;

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

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-11 10:36:05
+ * @LastEditTime: 2022-05-11 16:07:30
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \ronds.metadata\src\comps\MetadataForm\hooks\index.tsx
@@ -37,7 +37,12 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
         }
 
         // 兼容 common公共的属性
-        _extraInfo = _objectSpread(_objectSpread(_objectSpread({}, _extraInfo), _extraInfo[languageMap[getLocale()]]), _extraInfo[type]);
+        if (_extraInfo['common-en-US']) {
+          _extraInfo = _objectSpread(_objectSpread(_objectSpread({}, _extraInfo), _extraInfo[languageMap[getLocale()]]), _extraInfo[type]);
+        } else {
+          _extraInfo = _objectSpread(_objectSpread(_objectSpread({}, _extraInfo), _extraInfo.common), _extraInfo[type]);
+        }
+
         delete _extraInfo.common;
         delete _extraInfo['common-en-US'];
         delete _extraInfo[type];

package/es/comps/MetadataForm/index.d.ts

@@ -14,6 +14,10 @@ interface IMetadataFormProps {
      * 是否展示类型得提示信息
      */
     isShowTypeInfo?: boolean;
+    /**
+     * 是否折叠ref类型的表单
+     */
+    isFoldForm?: boolean;
     /**
      * 初始化值
      */

package/es/comps/MetadataForm/index.js

@@ -24,6 +24,8 @@ var MetadataForm = function MetadataForm(props) {
       disabled = _props$disabled === void 0 ? false : _props$disabled,
       _props$isRefForm = props.isRefForm,
       isRefForm = _props$isRefForm === void 0 ? true : _props$isRefForm,
+      _props$isFoldForm = props.isFoldForm,
+      isFoldForm = _props$isFoldForm === void 0 ? false : _props$isFoldForm,
       _props$isShowTypeInfo = props.isShowTypeInfo,
       isShowTypeInfo = _props$isShowTypeInfo === void 0 ? false : _props$isShowTypeInfo,
       initEnumValue = props.initEnumValue,
@@ -42,6 +44,7 @@ var MetadataForm = function MetadataForm(props) {
       fields = _React$useState4[0],
       setFields = _React$useState4[1];
 
+  var firstLoadRef = React.useRef(true);
   var stream$ = useMemoSubject();
   useObservable(function (p) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
@@ -98,9 +101,10 @@ var MetadataForm = function MetadataForm(props) {
     return function () {};
   }, [mySchma]);
   React.useEffect(function () {
-    if (initialValues) {
+    if (initialValues && firstLoadRef.current) {
       setTimeout(function () {
         form.setFieldsValue(_objectSpread({}, initialValues));
+        firstLoadRef.current = false;
       }, 500);
     }
   }, [initialValues]);
@@ -110,7 +114,8 @@ var MetadataForm = function MetadataForm(props) {
       form: form,
       stream$: stream$,
       initialValues: initialValues,
-      isShowTypeInfo: isShowTypeInfo
+      isShowTypeInfo: isShowTypeInfo,
+      isFoldForm: isFoldForm
     }
   }, /*#__PURE__*/React.createElement(_Form, {
     className: "metadata-form",
@@ -120,8 +125,7 @@ var MetadataForm = function MetadataForm(props) {
     },
     layout: "horizontal",
     form: form,
-    name: "control-hooks" // initialValues={initialValues}
-    ,
+    name: "control-hooks",
     onFinish: onFinish,
     onValuesChange: onValuesChange
   }, renderForm(mySchma, options, stream$))));

package/es/comps/MetadataForm/interface.d.ts

@@ -6,6 +6,7 @@ export interface IMetadataFormContextProps {
     stream$: any;
     initialValues: any;
     isShowTypeInfo: boolean;
+    isFoldForm: boolean;
 }
 export declare const MetadataFormContext: React.Context<IMetadataFormContextProps>;
 export interface IMetadataRefContextProps {

package/es/comps/MetadataForm/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-02 17:06:28
+ * @LastEditTime: 2022-05-11 11:55:02
  */
 import React from 'react';
 export var MetadataFormContext = /*#__PURE__*/React.createContext(null);

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.0.88",
+  "version": "1.0.91",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -45,7 +45,6 @@
     "markdown-it-emoji": "^2.0.0",
     "qs": "^6.10.1",
     "react": "^17.0.2",
-    "react-color": "^2.19.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",
     "rxjs": "^7.5.4"