ronds-metadata 1.0.98 → 1.1.1

package/es/comps/Editable/index.css

@@ -18,10 +18,6 @@
   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;

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

@@ -33,10 +33,6 @@ interface IEditableProps<R = any> {
      * 是否可以添加列
      */
     isAddColumn?: boolean;
-    /**
-     * 删除列白名单
-     */
-    whiteColumn?: string[];
     /**
      * antd自身的属性
      */

package/es/comps/Editable/index.js

@@ -32,7 +32,6 @@ var Editable = function Editable(props) {
       addPosition = _props$addPosition === void 0 ? 'bottom' : _props$addPosition,
       _props$isAddColumn = props.isAddColumn,
       isAddColumn = _props$isAddColumn === void 0 ? false : _props$isAddColumn,
-      whiteColumn = props.whiteColumn,
       tableProps = props.tableProps,
       onRowConfirm = props.onRowConfirm,
       onRowDelete = props.onRowDelete,
@@ -67,16 +66,9 @@ var Editable = function Editable(props) {
   var _React$useState9 = React.useState(),
       _React$useState10 = _slicedToArray(_React$useState9, 2),
       editHeardCellKey = _React$useState10[0],
-      setEditHeardCellkey = _React$useState10[1]; // 记录临时加的列头
+      setEditHeardCellkey = _React$useState10[1]; // 记录上一次发生改变的行值
 
 
-  var _React$useState11 = React.useState([]),
-      _React$useState12 = _slicedToArray(_React$useState11, 2),
-      addColumns = _React$useState12[0],
-      setAddColumns = _React$useState12[1];
-
-  var addColumnsRef = React.useRef([]); // 记录上一次发生改变的行值
-
   var lastValueRef = React.useRef(); // 记录上一次的datasource
 
   var lastDataSourceRef = React.useRef();
@@ -128,14 +120,6 @@ var Editable = function Editable(props) {
         setEditHeardCellkey(data.payload);
         break;
 
-      case 'onAddColumn':
-        processAddColumnsData(data.payload);
-        break;
-
-      case 'onDeleteColumn':
-        processDeleteColumnsData(data.payload);
-        break;
-
       case 'onSingleSave':
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
           onRowConfirm && onRowConfirm({
@@ -202,52 +186,7 @@ var Editable = function Editable(props) {
     }
   }, [type]); // 集中处理数据流
 
-  useObservable(processStreamFactory, [editableStream]);
-
-  var processAddColumnsData = function processAddColumnsData(data) {
-    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns; // 判断key是否重复
-
-
-    if (_columns.findIndex(function (v) {
-      return v.key === data.key;
-    }) > -1) {
-      // message.warning('表格的key不可以重复');
-      return;
-    }
-
-    var idx = _columns.findIndex(function (v) {
-      return v.dataIndex === data.dataIndex;
-    });
-
-    var obj = {
-      title: data.title,
-      key: data.key,
-      dataIndex: data.key
-    };
-
-    _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
-
-    setAddColumns(_toConsumableArray(_columns));
-    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
-  };
-
-  var processDeleteColumnsData = function processDeleteColumnsData(data) {
-    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns;
-
-    if (whiteColumn.findIndex(function (v) {
-      return v === data.dataIndex;
-    }) > -1) {
-      // message.warning(`${data.dataIndex}无法删除`);
-      return;
-    }
-
-    _columns = _columns.filter(function (v) {
-      return v.dataIndex != data.dataIndex;
-    });
-    setAddColumns(_toConsumableArray(_columns));
-    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
-  }; // 返回stream的实例
-
+  useObservable(processStreamFactory, [editableStream]); // 返回stream的实例
 
   React.useEffect(function () {
     if (firstLoadRef && editableStream) {
@@ -290,7 +229,7 @@ var Editable = function Editable(props) {
   }, [readonly, type]); // 处理一下编辑表格的数据
 
   var _columns = React.useMemo(function () {
-    var __columns__ = addColumns && addColumns.length > 0 ? addColumns : columns;
+    var __columns__ = columns;
 
     var res = __columns__.map(getEditColumn);
 
@@ -317,7 +256,7 @@ var Editable = function Editable(props) {
     }
 
     return res;
-  }, [columns, readonly, type, addColumns]); // 主要是自己加一层rowkey
+  }, [columns, readonly, type]); // 主要是自己加一层rowkey
 
 
   var _dataSource = React.useMemo(function () {
@@ -380,6 +319,7 @@ var Editable = function Editable(props) {
       }
     }
   }, /*#__PURE__*/React.createElement(_Table, _extends({
+    key: _columns.length,
     className: "ronds-edit-table",
     bordered: true,
     scroll: {

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

@@ -1,3 +1,4 @@
+import { FormInstance } from 'antd';
 import './index.less';
 interface IMetadataEditProps {
     /**
@@ -20,6 +21,10 @@ interface IMetadataEditProps {
      *  添加新的引用类型点击事件
      */
     onNewRefClick?: () => void;
+    /**
+     * 获取表单的实例
+     */
+    getFormInstance?: (form: FormInstance) => void;
 }
 declare const MetadataEdit: (props: IMetadataEditProps) => JSX.Element;
 export default MetadataEdit;

package/es/comps/MetadataEdit/index.js

@@ -23,7 +23,8 @@ var MetadataEdit = function MetadataEdit(props) {
       isNameDisabled = props.isNameDisabled,
       metadataTag = props.metadataTag,
       onFinish = props.onFinish,
-      onNewRefClick = props.onNewRefClick;
+      onNewRefClick = props.onNewRefClick,
+      getFormInstance = props.getFormInstance;
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -62,7 +63,16 @@ var MetadataEdit = function MetadataEdit(props) {
       _React$useState10 = _slicedToArray(_React$useState9, 2),
       curFields = _React$useState10[0],
       setCurFields = _React$useState10[1];
+  /**
+   * 获取form的实例
+   */
 
+
+  React.useEffect(function () {
+    if (form) {
+      getFormInstance && getFormInstance(form);
+    }
+  }, [form]);
   React.useEffect(function () {
     form.setFieldsValue({
       id: 'Test'

package/package.json

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