linkmore-design 1.1.23 → 1.1.24

package/es/LmEditTable/EditTable.js

@@ -465,7 +465,17 @@ var EditableCell = function EditableCell(props) {
   };
 
   var Control = function Control(con) {
+    var _a; // const resultComponentProps = isFunction(componentProps) ? componentProps?.(record, col) : componentProps
+
+
     var resultComponentProps = isFunction(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
+
+    if (isFunction(componentProps) && ((_a = col === null || col === void 0 ? void 0 : col.newOptions) === null || _a === void 0 ? void 0 : _a.length)) {
+      resultComponentProps = Object.assign(Object.assign({}, resultComponentProps), {
+        options: col === null || col === void 0 ? void 0 : col.newOptions
+      });
+    }
+
     var clearAttrComponentProps = omit(resultComponentProps, ['optionOnly', 'isOnlyValue']);
 
     switch (con) {
@@ -601,7 +611,8 @@ var EditableCell = function EditableCell(props) {
 
       case 'render':
         {
-          var render = resultComponentProps.render;
+          var _resultComponentProps = resultComponentProps,
+              render = _resultComponentProps.render;
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !isObjEmpty(fromData) ? Object.assign(Object.assign({}, record), _defineProperty({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
@@ -1049,10 +1060,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
 
   var hasDisableOptions = useMemo(function () {
+    // const hasOnlyOptionsDatas = columns.filter(item => item?.['componentProps']?.optionOnly)
     var hasOnlyOptionsDatas = columns.filter(function (item) {
       var _a;
 
-      return (_a = item === null || item === void 0 ? void 0 : item['componentProps']) === null || _a === void 0 ? void 0 : _a.optionOnly;
+      var resultComponentProps = isFunction(item === null || item === void 0 ? void 0 : item.componentProps) ? (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+      return resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.optionOnly;
     });
 
     if (hasOnlyOptionsDatas.length) {
@@ -1067,9 +1080,14 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var DisableOptions = useMemo(function () {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-      var _ref5 = item['componentProps'] || {},
+      var _a;
+
+      var resultComponentProps = isFunction(item.componentProps) ? (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+
+      var _ref5 = resultComponentProps || {},
           optionOnly = _ref5.optionOnly,
-          options = _ref5.options;
+          options = _ref5.options; // const { optionOnly, options } = item['componentProps'] || {}
+
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1081,6 +1099,13 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
             disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
           });
         });
+
+        if (isFunction(item.componentProps)) {
+          return Object.assign(Object.assign({}, item), {
+            newOptions: newOptions
+          });
+        }
+
         return Object.assign(Object.assign({}, item), {
           componentProps: Object.assign(Object.assign({}, item['componentProps']), {
             options: newOptions

package/es/TreeSelect/index.js

@@ -82,7 +82,8 @@ var CLMTreeSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     className: 'lm_tree_select',
     value: resetValue,
     size: mergeSize,
-    disabled: mergedDisabled
+    disabled: mergedDisabled,
+    treeData: treeData
   }, resetProps), children);
 });
 var LMTreeSelect = CLMTreeSelect;

package/lib/LmEditTable/EditTable.js

@@ -498,7 +498,17 @@ var EditableCell = function EditableCell(props) {
   };
 
   var Control = function Control(con) {
+    var _a; // const resultComponentProps = isFunction(componentProps) ? componentProps?.(record, col) : componentProps
+
+
     var resultComponentProps = (0, _lodash.isFunction)(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
+
+    if ((0, _lodash.isFunction)(componentProps) && ((_a = col === null || col === void 0 ? void 0 : col.newOptions) === null || _a === void 0 ? void 0 : _a.length)) {
+      resultComponentProps = Object.assign(Object.assign({}, resultComponentProps), {
+        options: col === null || col === void 0 ? void 0 : col.newOptions
+      });
+    }
+
     var clearAttrComponentProps = (0, _lodash.omit)(resultComponentProps, ['optionOnly', 'isOnlyValue']);
 
     switch (con) {
@@ -634,7 +644,8 @@ var EditableCell = function EditableCell(props) {
 
       case 'render':
         {
-          var render = resultComponentProps.render;
+          var _resultComponentProps = resultComponentProps,
+              render = _resultComponentProps.render;
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !(0, _util.isObjEmpty)(fromData) ? Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
@@ -1081,10 +1092,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var hasDisableOptions = (0, _react.useMemo)(function () {
+    // const hasOnlyOptionsDatas = columns.filter(item => item?.['componentProps']?.optionOnly)
     var hasOnlyOptionsDatas = columns.filter(function (item) {
       var _a;
 
-      return (_a = item === null || item === void 0 ? void 0 : item['componentProps']) === null || _a === void 0 ? void 0 : _a.optionOnly;
+      var resultComponentProps = (0, _lodash.isFunction)(item === null || item === void 0 ? void 0 : item.componentProps) ? (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+      return resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.optionOnly;
     });
 
     if (hasOnlyOptionsDatas.length) {
@@ -1099,9 +1112,14 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var DisableOptions = (0, _react.useMemo)(function () {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-      var _ref5 = item['componentProps'] || {},
+      var _a;
+
+      var resultComponentProps = (0, _lodash.isFunction)(item.componentProps) ? (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+
+      var _ref5 = resultComponentProps || {},
           optionOnly = _ref5.optionOnly,
-          options = _ref5.options;
+          options = _ref5.options; // const { optionOnly, options } = item['componentProps'] || {}
+
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1113,6 +1131,13 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
           });
         });
+
+        if ((0, _lodash.isFunction)(item.componentProps)) {
+          return Object.assign(Object.assign({}, item), {
+            newOptions: newOptions
+          });
+        }
+
         return Object.assign(Object.assign({}, item), {
           componentProps: Object.assign(Object.assign({}, item['componentProps']), {
             options: newOptions

package/lib/TreeSelect/index.js

@@ -101,7 +101,8 @@ var CLMTreeSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     className: 'lm_tree_select',
     value: resetValue,
     size: mergeSize,
-    disabled: mergedDisabled
+    disabled: mergedDisabled,
+    treeData: treeData
   }, resetProps), children);
 });
 var LMTreeSelect = CLMTreeSelect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"