linkmore-design 1.0.64 → 1.0.66

package/lib/LmEditTable/EditTable.js

@@ -436,6 +436,7 @@ var EditableCell = function EditableCell(props) {
             return ((_b = (_a = option.children) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.indexOf(input.toLowerCase())) >= 0;
           }
         }, componentProps, {
+          // open={true}
           onChange: handleFormItemChange
         }));
 
@@ -834,8 +835,60 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setDataSource(res);
     }
   };
+  /** 判断columne中有没有带optionOnly参数  */
+
+
+  var hasDisableOptions = (0, _react.useMemo)(function () {
+    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;
+    });
+
+    if (hasOnlyOptionsDatas.length) {
+      return hasOnlyOptionsDatas.map(function (item) {
+        return item.dataIndex;
+      });
+    }
+
+    return false;
+  }, [columns]);
+  /** 动态获取disabled的props数据源 */
+
+  var DisableOptions = (0, _react.useMemo)(function () {
+    var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
+      var _ref3 = item.componentProps || {},
+          optionOnly = _ref3.optionOnly,
+          options = _ref3.options;
+
+      if (optionOnly && options) {
+        var dataIndex = item.dataIndex;
+        var dataIndexData = dataSource.map(function (d) {
+          return d[dataIndex];
+        });
+        var newOptions = options.map(function (o) {
+          return Object.assign(Object.assign({}, o), {
+            disabled: dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value) ? true : false
+          });
+        });
+        return Object.assign(Object.assign({}, item), {
+          componentProps: Object.assign(Object.assign({}, item.componentProps), {
+            options: newOptions
+          })
+        });
+      } else {
+        return item;
+      }
+    });
+    return newColumns;
+  }, [columns, dataSource]);
+  var memoOptions = (0, _react.useMemo)(function () {
+    return hasDisableOptions ? [DisableOptions] : [];
+  }, [hasDisableOptions, DisableOptions]);
+  /** 组装之后的最终columns */
 
   var resultColumns = (0, _react.useMemo)(function () {
+    var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
       title: '',
       dataIndex: 'sort',
@@ -846,7 +899,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           id: record[_rowKey] || record.id
         });
       }
-    } : null].concat((0, _toConsumableArray2.default)(columns), [useQuickOpetate ? {
+    } : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -887,18 +940,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
           var dataIndex = col.dataIndex;
 
-          if (col === null || col === void 0 ? void 0 : col.fixed) {
+          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex)) {
             return true;
           }
 
           return record[dataIndex] === prevRecord[dataIndex] ? false : true;
         },
-        // render: (text: string, record: Record<string, any>, index: number) => {
-        //   const { editable, render } = record
-        //   if (!editable && render) {
-        //     return render?.(text, record ,index)
-        //   }
-        // },
         onCell: function onCell(record) {
           return {
             getLength: function getLength() {
@@ -926,9 +973,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
     });
-    console.log(res, '---res');
     return res;
-  }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable]);
+  }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable, (0, _toConsumableArray2.default)(memoOptions)]);
   var DraggableContainer = (0, _react.useCallback)(function (_a) {
     var _b;
 

package/lib/LmFilter/components/DropdownFIlter.js

@@ -106,7 +106,6 @@ var getLabel = function getLabel(filterValue, item) {
       data = item.data; // 不存在筛选时
 
   if (!(0, _utils.getIsHas)(filterValue)) {
-    console.log('label', filterValue, item);
     return getPlacehodler(item);
   } // 存在筛选数据时 ⬇️
   // 级联数据转换平级结构

package/lib/LmFilter/filterFns/index.js

@@ -346,6 +346,11 @@ var useCoreOptions = function useCoreOptions(_ref) {
       type: 'changeBasicQuery',
       basicQuery: basicQuery
     });
+    var globalQuery = {
+      filters: [{
+        conditions: tranformQuery(state.customFilter.data)
+      }]
+    };
     var filterQuery = {
       filters: [{
         conditions: (_Object$keys7 = Object.keys(basicQuery)) === null || _Object$keys7 === void 0 ? void 0 : _Object$keys7.map(function (k) {
@@ -355,6 +360,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
     };
     return {
       basicFilter: basicFilter,
+      globalQuery: globalQuery,
       filterQuery: filterQuery,
       type: 'basic'
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.64",
+  "version": "1.0.66",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -35,7 +35,7 @@
     "create": "node ./config/main.js",
     "dumi": "dumi dev",
     "dumi:build": "dumi build",
-    "pub": "npm run build && npm verion patch && npm publish"
+    "pub": "npm run build && npm version patch && npm publish"
   },
   "lint-staged": {
     "gitDir": "../",