ronds-metadata 1.0.71 → 1.0.74

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

@@ -70,7 +70,7 @@ declare class Texty extends React.PureComponent<ITextyProps, any> {
     componentDidUpdate(): void;
     componentWillUnmount(): void;
     render(): JSX.Element;
-    renderTooltip: ({ ref, style, placement, arrowProps, }: any) => React.ReactPortal;
+    renderTooltip: ({ ref, style, placement, arrowProps }: any) => React.ReactPortal;
     setTargetRef: (ref: any) => void;
     handleMouseEvent: (e: any) => void;
     handleScroll: (e: any) => void;

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

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

package/es/comps/Editable/index.js

@@ -31,6 +31,7 @@ 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,
@@ -208,8 +209,7 @@ var Editable = function Editable(props) {
     if (_columns.findIndex(function (v) {
       return v.key === data.key;
     }) > -1) {
-      _message.warning('表格的key不可以重复');
-
+      // message.warning('表格的key不可以重复');
       return;
     }
 
@@ -232,6 +232,13 @@ var Editable = function Editable(props) {
   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;
     });

package/package.json

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