ronds-metadata 1.2.55 → 1.2.57

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

@@ -6,11 +6,11 @@ var _excluded = ["title", "isAddColumn", "editable", "record", "editableType", "
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 10:01:10
- * @LastEditTime: 2023-03-25 09:01:46
+ * @LastEditTime: 2023-05-23 10:17:15
  */
 import React from 'react';
 import { EditableContext } from '../interface';
-import { getDataCell, isFreeEditCell, isFreeEditRow } from '../utils';
+import { getDataCell, isCellDisabled, isFreeEditCell, isFreeEditRow } from '../utils';
 import './index.less';
 import Texty from './Texty';
 import { tr } from '../../../framework/locale';
@@ -88,7 +88,7 @@ var EditableCell = function EditableCell(props) {
   }
   return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
     className: "".concat(className, " ").concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
-  }), editable ? getDataCell(props) : /*#__PURE__*/React.createElement(Texty, {
+  }), editable && isCellDisabled(record, restProps === null || restProps === void 0 ? void 0 : restProps.cellDisabled) ? getDataCell(props) : /*#__PURE__*/React.createElement(Texty, {
     tooltipStyle: {
       wordWrap: 'break-word'
     },

package/es/comps/Editable/comps/EditableRow.js

@@ -2,10 +2,12 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["record", "index", "className"];
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 10:01:10
- * @LastEditTime: 2023-01-04 10:39:58
+ * @LastEditTime: 2023-05-24 09:07:32
  */
 import React from 'react';
 import { useDrag, useDrop } from 'react-dnd';
@@ -14,7 +16,7 @@ var EditableRow = function EditableRow(props) {
   var record = props.record,
     index = props.index,
     className = props.className,
-    onMove = props.onMove;
+    restProps = _objectWithoutProperties(props, _excluded);
   var _Form$useForm = _Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -30,7 +32,7 @@ var EditableRow = function EditableRow(props) {
       collect: function collect(monitor) {
         var _ref2 = monitor.getItem() || {},
           dragIndex = _ref2.index;
-        if (dragIndex === index || !onMove) {
+        if (dragIndex === index || !(restProps === null || restProps === void 0 ? void 0 : restProps.onMove)) {
           return {};
         }
         return {
@@ -39,10 +41,10 @@ var EditableRow = function EditableRow(props) {
         };
       },
       drop: function drop(item, monitor) {
-        onMove && onMove({
+        (restProps === null || restProps === void 0 ? void 0 : restProps.onMove) && (restProps === null || restProps === void 0 ? void 0 : restProps.onMove({
           dragIndex: item.index,
           hoverIndex: index
-        });
+        }));
       }
     }),
     _useDrop2 = _slicedToArray(_useDrop, 2),
@@ -67,7 +69,7 @@ var EditableRow = function EditableRow(props) {
     }),
     _useDrag2 = _slicedToArray(_useDrag, 2),
     drag = _useDrag2[1];
-  onMove && drop(drag(ref));
+  (restProps === null || restProps === void 0 ? void 0 : restProps.onMove) && drop(drag(ref));
   var onValuesChange = function onValuesChange(values, allValues) {
     if (editableStream) {
       editableStream.next({

package/es/comps/Editable/index.js

@@ -11,7 +11,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxain
  * @Date: 2022-03-04 08:53:04
- * @LastEditTime: 2023-02-25 11:11:58
+ * @LastEditTime: 2023-05-23 09:20:36
  */
 import React from 'react';
 import { pick, isArray } from 'lodash';
@@ -205,7 +205,7 @@ var Editable = function Editable(props) {
           record: record,
           editableType: type,
           isAddColumn: isAddColumn
-        }, pick(column, ['editable', 'title', 'dataIndex', 'type', 'enum', 'mode', 'disabled'])), {}, {
+        }, pick(column, ['editable', 'title', 'dataIndex', 'type', 'enum', 'mode', 'disabled', 'cellDisabled'])), {}, {
           rowIndex: rowIndex
         });
       };

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

@@ -5,6 +5,7 @@ export interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
     title: any;
     editable: boolean;
     disabled?: boolean;
+    cellDisabled?: string;
     dataIndex: string;
     isAddColumn: boolean;
     rowIndex: number;

package/es/comps/Editable/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 15:07:57
- * @LastEditTime: 2023-01-04 10:38:53
+ * @LastEditTime: 2023-05-23 09:16:25
  */
 import React from 'react';
 export var EditableContext = /*#__PURE__*/React.createContext(null);

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

@@ -2,4 +2,5 @@ import { EditableCellProps } from './interface';
 export declare function getDataCell(item: EditableCellProps): JSX.Element;
 export declare function isFreeEditRow(curRow: any, rowIndex: number): boolean;
 export declare function isFreeEditCell(editCellKey: any, dataIndex: string, rowIndex: number): boolean;
+export declare function isCellDisabled(record: any, cellDisabled?: string): boolean;
 export declare function removeCurKeyFromEditRow(editRowKey: any, curKey: number): string;

package/es/comps/Editable/utils.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:59:04
- * @LastEditTime: 2022-07-07 08:35:35
+ * @LastEditTime: 2023-05-23 10:33:54
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -31,6 +31,30 @@ export function isFreeEditRow(curRow, rowIndex) {
 export function isFreeEditCell(editCellKey, dataIndex, rowIndex) {
   return (editCellKey === null || editCellKey === void 0 ? void 0 : editCellKey.dataIndex) === dataIndex && (editCellKey === null || editCellKey === void 0 ? void 0 : editCellKey.rowIndex) === rowIndex;
 }
+export function isCellDisabled(record, cellDisabled) {
+  if (cellDisabled) {
+    var regex = /\w+(\.\w+)?[=<>!]{1}|\w+(\.\w+)?(\.indexOf\('.+'\)[=<>!]{1})/g;
+    var keys = cellDisabled.trim().match(regex);
+    if (!keys) {
+      return true;
+    }
+    var expression = cellDisabled;
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i].substring(0, keys[i].length - 1);
+      // 处理.length 之类的状况
+      var _key = key.split('.');
+      var _changeData = record[_key[0]];
+      if (_changeData || _changeData === 0) {
+        var r = key === _key[0] ? "'".concat(_changeData, "'") : eval("_changeData.".concat(_key[1]));
+        expression = expression.replace(key, r);
+      } else {
+        expression = expression.replace(key, undefined);
+      }
+    }
+    return !eval(expression);
+  }
+  return true;
+}
 export function removeCurKeyFromEditRow(editRowKey, curKey) {
   var keys = editRowKey.toString().split(',');
   var res = [];

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

@@ -37,7 +37,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-05-18 17:18:32
+ * @LastEditTime: 2023-05-24 09:08:30
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -91,7 +91,7 @@ function Index(props) {
     _React$useState12 = _slicedToArray(_React$useState11, 2),
     expandedKeys = _React$useState12[0],
     setExpandedKeys = _React$useState12[1];
-  var firstLoadTreeSelectRef = React.useRef(false);
+  var firstLoadTreeSelectRef = React.useRef(true);
   var pageRef = React.useRef(1);
   var totalRef = React.useRef();
   var onSelect = function onSelect(value) {

package/package.json

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