ronds-metadata 1.1.25 → 1.1.28

package/es/comps/Editable/DataCell/ButtonCell.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/ButtonCell.js

@@ -0,0 +1,45 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+
+/*
+ * @Author: wangxian
+ * @Date: 2022-03-04 14:53:50
+ * @LastEditTime: 2022-07-08 08:57:41
+ */
+import React from 'react';
+import { SettingOutlined } from '@ant-design/icons';
+import { EditableContext } from '../interface';
+
+function Index(props) {
+  var dataIndex = props.dataIndex,
+      record = props.record,
+      disabled = props.disabled;
+
+  var _ref = React.useContext(EditableContext) || undefined,
+      editableStream = _ref.editableStream,
+      editConfig = _ref.editConfig;
+
+  var onClick = function onClick(e) {
+    e.stopPropagation();
+    editableStream && editableStream.next({
+      type: 'onButtonCellClick',
+      payload: record
+    });
+  };
+
+  return /*#__PURE__*/React.createElement(_Form.Item, {
+    name: dataIndex,
+    style: {
+      margin: 0
+    }
+  }, /*#__PURE__*/React.createElement(_Button, {
+    type: "link",
+    disabled: editConfig.type === 'edit' ? disabled : false,
+    onClick: onClick,
+    icon: /*#__PURE__*/React.createElement(SettingOutlined, null)
+  }));
+}
+
+export default /*#__PURE__*/React.memo(Index);

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

@@ -6,46 +6,24 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-07-06 14:32:00
+ * @LastEditTime: 2022-07-07 08:45:08
  */
 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

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

@@ -41,6 +41,10 @@ interface IEditableProps<R = any> {
      * 每行确认回调函数
      */
     onRowClick?: (record: any) => void;
+    /**
+     * 表格按钮点击事件
+     */
+    onButtonCellClick?: (record: any) => void;
     /**
      * 每行确认回调函数
      */

package/es/comps/Editable/index.js

@@ -34,6 +34,7 @@ var Editable = function Editable(props) {
       isAddColumn = _props$isAddColumn === void 0 ? false : _props$isAddColumn,
       tableProps = props.tableProps,
       onRowClick = props.onRowClick,
+      onButtonCellClick = props.onButtonCellClick,
       onRowConfirm = props.onRowConfirm,
       onRowDelete = props.onRowDelete,
       onMulChange = props.onMulChange,
@@ -125,6 +126,10 @@ var Editable = function Editable(props) {
         onRowClick && onRowClick(data.payload);
         break;
 
+      case 'onButtonCellClick':
+        onButtonCellClick && onButtonCellClick(data.payload);
+        break;
+
       case 'onSingleSave':
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
           onRowConfirm && onRowConfirm({

package/es/comps/Editable/utils.js

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

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

@@ -171,7 +171,7 @@ var TableArray = function TableArray(props) {
         title: getLabelByProps(it),
         key: it.id,
         dataIndex: it.id,
-        width: 100,
+        width: processColumnType(it, extraInfo) === 'buttonCell' ? 60 : 100,
         editable: true,
         type: processColumnType(it, extraInfo),
         enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
@@ -196,6 +196,13 @@ var TableArray = function TableArray(props) {
     form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
   };
 
+  var onButtonCellClick = function onButtonCellClick(record) {
+    formContext.stream$.next({
+      type: 'onButtonCellClick',
+      payload: record
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%',
@@ -213,6 +220,7 @@ var TableArray = function TableArray(props) {
     columns: columns,
     dataSource: list,
     onMulChange: onTableChange,
+    onButtonCellClick: onButtonCellClick,
     tableProps: {
       scroll: {
         x: '100%',

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

@@ -50,6 +50,10 @@ interface IMetadataFormProps {
      * select选择的回调
      */
     onSelectChange?: (changedValues: any) => void;
+    /**
+     * select选择的回调
+     */
+    onCellButtonClick?: (changedValues: any) => void;
 }
 declare const MetadataForm: (props: IMetadataFormProps) => JSX.Element;
 export default MetadataForm;

package/es/comps/MetadataForm/index.js

@@ -32,7 +32,8 @@ var MetadataForm = function MetadataForm(props) {
       onFinish = props.onFinish,
       getFormInstance = props.getFormInstance,
       onValuesChange = props.onValuesChange,
-      onSelectChange = props.onSelectChange;
+      onSelectChange = props.onSelectChange,
+      onCellButtonClick = props.onCellButtonClick;
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -55,6 +56,8 @@ var MetadataForm = function MetadataForm(props) {
   useObservable(function (p) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
       onSelectChange && onSelectChange(p.payload);
+    } else if ((p === null || p === void 0 ? void 0 : p.type) === 'onButtonCellClick') {
+      onCellButtonClick && onCellButtonClick(p.payload);
     }
   }, [stream$]);
   var options = React.useMemo(function () {
@@ -122,10 +125,16 @@ var MetadataForm = function MetadataForm(props) {
   }, [mySchma]);
   React.useEffect(function () {
     if (initialValues && firstLoadRef.current) {
-      setTimeout(function () {
+      try {
         form.setFieldsValue(_objectSpread({}, initialValues));
         firstLoadRef.current = false;
-      }, 500);
+      } catch (ex) {
+        console.warn('init not sucess');
+        setTimeout(function () {
+          form.setFieldsValue(_objectSpread({}, initialValues));
+          firstLoadRef.current = false;
+        }, 500);
+      }
     }
   }, [initialValues]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MetadataFormContext.Provider, {

package/package.json

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