ronds-metadata 1.1.22 → 1.1.25

package/es/comps/Editable/DataCell/ColorPicker.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EditableCellProps } from '../interface';
+declare function Index(props: EditableCellProps): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof Index>;
+export default _default;

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

@@ -0,0 +1,55 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+
+/*
+ * @Author: wangxian
+ * @Date: 2022-03-04 14:53:50
+ * @LastEditTime: 2022-07-06 14:32:00
+ */
+import React from 'react';
+import { EditableContext } from '../interface';
+
+function Index(props) {
+  var dataIndex = props.dataIndex,
+      rowIndex = props.rowIndex,
+      disabled = props.disabled;
+
+  var _ref = React.useContext(EditableContext) || undefined,
+      editConfig = _ref.editConfig;
+
+  var inputRef = React.useRef();
+  var firstLoadRef = React.useRef(true);
+  React.useEffect(function () {
+    var _editConfig$editCellK, _editConfig$editCellK2;
+
+    if (!inputRef.current) return;
+
+    if (((_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.dataIndex) === dataIndex && ((_editConfig$editCellK2 = editConfig.editCellKey) === null || _editConfig$editCellK2 === void 0 ? void 0 : _editConfig$editCellK2.rowIndex) === rowIndex) {
+      if (firstLoadRef.current) {
+        var _inputRef$current$sta, _inputRef$current$sta2;
+
+        // 选中内容
+        inputRef.current.input.setSelectionRange(0, ((_inputRef$current$sta = inputRef.current.state) === null || _inputRef$current$sta === void 0 ? void 0 : (_inputRef$current$sta2 = _inputRef$current$sta.value) === null || _inputRef$current$sta2 === void 0 ? void 0 : _inputRef$current$sta2.length) || 0);
+        firstLoadRef.current = false;
+      } // 设置焦点
+
+
+      inputRef.current.focus();
+    }
+  }, [editConfig]);
+  return /*#__PURE__*/React.createElement(_Form.Item, {
+    name: dataIndex,
+    style: {
+      margin: 0
+    }
+  }, /*#__PURE__*/React.createElement(_Input, {
+    ref: inputRef,
+    type: "color",
+    size: "small",
+    disabled: editConfig.type === 'edit' ? disabled : false
+  }));
+}
+
+export default /*#__PURE__*/React.memo(Index);

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

@@ -50,9 +50,9 @@ var EditableHeardCell = function EditableHeardCell(props) {
   var myStyle = React.useMemo(function () {
     var res = {};
 
-    if (style) {
+    if (style === null || style === void 0 ? void 0 : style.right) {
       res = _objectSpread(_objectSpread({}, style), {}, {
-        right: style.right - 6
+        right: (style === null || style === void 0 ? void 0 : style.right) - 6
       });
     }
 

package/es/comps/Editable/utils.js

@@ -1,18 +1,20 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:59:04
- * @LastEditTime: 2022-03-09 10:42:38
+ * @LastEditTime: 2022-07-06 14:27:13
  */
 import React from 'react';
 import Input from './DataCell/Input';
 import Number from './DataCell/Number';
 import Select from './DataCell/Select';
 import Switch from './DataCell/Switch';
+import ColorPicker from './DataCell/ColorPicker';
 var DataCellMap = {
   text: Input,
   number: Number,
   enum: Select,
-  bool: Switch
+  bool: Switch,
+  colorPicker: ColorPicker
 };
 export function getDataCell(item) {
   if (item.type && DataCellMap[item.type]) {

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

@@ -14,7 +14,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-23 16:51:06
+ * @LastEditTime: 2022-07-04 15:54:53
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -221,6 +221,10 @@ function Index(props) {
         disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
         options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
+        showSearch: true,
+        filterOption: function filterOption(input, option) {
+          return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
+        },
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;
         },

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

@@ -13,6 +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';
 
 var TableArray = function TableArray(props) {
   var initValue = props.initValue,
@@ -124,24 +125,56 @@ var TableArray = function TableArray(props) {
       firstLoadRef.current = false;
     }
   }, [initValue, form]);
+  var processEnumData = React.useCallback(function (data, _extraInfo) {
+    var _extraInfo$enum;
+
+    var _options = [];
+
+    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);
+    }
+
+    _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);
+    });
+
+    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 it = _properties[i];
+      var extraInfo = refFieldsRef.current.get(it.id);
       var obj = {
         title: getLabelByProps(it),
         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
+        type: processColumnType(it, extraInfo),
+        enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
       };
 
       _columns.push(obj);

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

@@ -5,10 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-21 08:51:08
- * @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
+ * @LastEditTime: 2022-07-06 14:02:17
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';

package/package.json

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