linkmore-design 1.0.64 → 1.0.68

package/lib/LmEditTable/EditTable.js

@@ -289,7 +289,25 @@ var EditableCell = function EditableCell(props) {
 
   var _col$componentProps = col.componentProps,
       componentProps = _col$componentProps === void 0 ? {} : _col$componentProps,
-      dataIndex = col.dataIndex; // const checkCellRef = useRef(null)
+      dataIndex = col.dataIndex;
+  /** 是否正在编辑中 */
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      editing = _useState2[0],
+      setEditing = _useState2[1];
+
+  var inputRef = (0, _react.useRef)(null);
+  var form = (0, _react.useContext)(EditableContext);
+  (0, _react.useEffect)(function () {
+    if (editing) {
+      inputRef.current.focus();
+    }
+  }, [editing]);
+
+  var toggleEdit = function toggleEdit() {
+    setEditing(!editing); // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
+  }; // const checkCellRef = useRef(null)
   // const focusCapturedRef = useRef(false);
   // const curValue = useMemo(() => {
   //   return record?.dataIndex
@@ -297,6 +315,7 @@ var EditableCell = function EditableCell(props) {
   // const curValueIsValid = isValidValue(curValue);
   // 校验保存
 
+
   var save = function save(row) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var values;
@@ -340,19 +359,29 @@ var EditableCell = function EditableCell(props) {
               return form.validateFields();
 
             case 10:
-              _context.next = 14;
+              if (col === null || col === void 0 ? void 0 : col.hoverEdit) {
+                toggleEdit();
+              } // // 清空异常校验
+              // setValid((old) => {
+              //   const obj = { ...old }
+              //   delete obj[record[rowKey]]
+              //   return obj
+              // })
+
+
+              _context.next = 15;
               break;
 
-            case 12:
-              _context.prev = 12;
+            case 13:
+              _context.prev = 13;
               _context.t1 = _context["catch"](0);
 
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 12]]);
+      }, _callee, null, [[0, 13]]);
     }));
   }; // 触发保存
 
@@ -371,7 +400,6 @@ var EditableCell = function EditableCell(props) {
 
   var copyKey = function copyKey(e) {
     e === null || e === void 0 ? void 0 : e.stopPropagation();
-    console.log(rowKey, record[rowKey], 'fff');
     var dataIndex = col.dataIndex;
     handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex]);
   };
@@ -382,7 +410,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
           onPressEnter: handleFormItemChange,
           onBlur: handleFormItemChange,
-          // ref={checkCellRef}
+          ref: inputRef,
           placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps, {
           addonBefore: componentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
@@ -397,7 +425,9 @@ var EditableCell = function EditableCell(props) {
           }, /*#__PURE__*/_react.default.cloneElement(componentProps.addonAfter, {
             onChange: handleFormItemChange
           })) : null,
-          suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+          suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", {
+            className: 'lm_table_quickcopy'
+          }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
             onClick: copyKey,
             type: 'lmweb-icon_m_brush'
           })) : null
@@ -405,7 +435,8 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/_react.default.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
 
       case 'number':
@@ -415,7 +446,8 @@ var EditableCell = function EditableCell(props) {
           style: {
             width: (editEnum === null || editEnum === void 0 ? void 0 : editEnum.width) || '100%'
           },
-          placeholder: "\u8BF7\u8F93\u5165"
+          placeholder: "\u8BF7\u8F93\u5165",
+          ref: inputRef
         }, componentProps));
 
       case 'date':
@@ -429,13 +461,14 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          // ref={checkCellRef}
+          ref: inputRef,
           filterOption: function filterOption(input, option) {
             var _a, _b;
 
             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
         }));
 
@@ -445,7 +478,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          // ref={checkCellRef}
+          ref: inputRef,
           filterOption: function filterOption(input, option) {
             var _a;
 
@@ -457,23 +490,26 @@ var EditableCell = function EditableCell(props) {
 
       case 'checkbox':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
 
       case 'radio':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
 
       case 'switch':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, {
+          size: 'small',
           onChange: handleFormItemChange
         });
 
       case 'upload':
         return /*#__PURE__*/_react.default.createElement(UploadSingle, {
           editEnum: componentProps,
-          // ref={checkCellRef}
+          ref: inputRef,
           onChange: handleFormItemChange
         });
 
@@ -482,7 +518,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          // ref={checkCellRef}
+          ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength
@@ -499,7 +535,8 @@ var EditableCell = function EditableCell(props) {
       default:
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
           onPressEnter: handleFormItemChange,
-          onBlur: handleFormItemChange
+          onBlur: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
     }
   };
@@ -508,10 +545,19 @@ var EditableCell = function EditableCell(props) {
     var editable = col.editable,
         dataIndex = col.dataIndex,
         formProps = col.formProps,
-        componentProps = col.componentProps;
+        componentProps = col.componentProps,
+        hoverEdit = col.hoverEdit;
     var childNode = children;
 
-    if (isEdit && editable) {
+    if (hoverEdit && !editing) {
+      childNode = /*#__PURE__*/_react.default.createElement("div", {
+        className: "editable-cell-value-wrap",
+        style: {
+          minHeight: '22px'
+        },
+        onClick: toggleEdit
+      }, childNode);
+    } else if (isEdit && editable) {
       childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
         errorPlacement: "right",
         valuePropName: editable === 'switch' ? 'checked' : 'value',
@@ -535,9 +581,8 @@ var EditableCell = function EditableCell(props) {
     }
 
     return childNode;
-  }, [col, isEdit]); // const [childNode, setChildNode] = useState(getMemoChildNode);
-
-  var form = (0, _react.useContext)(EditableContext); // 出现死循环找我
+  }, [col, isEdit, editing]); // const [childNode, setChildNode] = useState(getMemoChildNode);
+  // 出现死循环找我
 
   (0, _react.useEffect)(function () {
     var editable = col.editable,
@@ -610,26 +655,26 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       size = _props$size === void 0 ? 'small' : _props$size,
       resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size"]);
 
-  var _useState = (0, _react.useState)([]),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      dataSource = _useState2[0],
-      setDataSource = _useState2[1]; // const [count, setCount] = useState(0);
-
-
-  var _useState3 = (0, _react.useState)({}),
+  var _useState3 = (0, _react.useState)([]),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      _valid = _useState4[0],
-      setValid = _useState4[1];
+      dataSource = _useState4[0],
+      setDataSource = _useState4[1]; // const [count, setCount] = useState(0);
+
 
-  var _useState5 = (0, _react.useState)([]),
+  var _useState5 = (0, _react.useState)({}),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      localRowSelectList = _useState6[0],
-      setLocalRowSelectList = _useState6[1];
+      _valid = _useState6[0],
+      setValid = _useState6[1];
 
   var _useState7 = (0, _react.useState)([]),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      sortEditTable = _useState8[0],
-      setCallBackFalg = _useState8[1];
+      localRowSelectList = _useState8[0],
+      setLocalRowSelectList = _useState8[1];
+
+  var _useState9 = (0, _react.useState)([]),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      sortEditTable = _useState10[0],
+      setCallBackFalg = _useState10[1];
 
   var dataSourceRef = (0, _react.useRef)([]);
   var sortDataSorceRef = (0, _react.useRef)([]);
@@ -834,19 +879,72 @@ 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: '',
+      title: '排序',
       dataIndex: 'sort',
-      width: 32,
-      maxWidth: 32,
+      width: 48,
+      maxWidth: 48,
+      className: 'drag-visible',
       render: function render(_, record) {
         return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
           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,
@@ -885,20 +983,16 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
       return Object.assign(Object.assign({}, col), {
         shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
+          var _a;
+
           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) || ((_a = col.componentProps) === null || _a === void 0 ? void 0 : _a.options)) {
             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 +1020,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;
 
@@ -1071,8 +1164,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     style: {
       marginTop: 8
     }
-  }, /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, {
-    className: "lmweb-plus"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-plus"
   }), "\u65B0\u589E"));
 });
 

package/lib/LmEditTable/style/index.css

@@ -512,6 +512,9 @@ html {
   line-height: 1;
   gap: 8px;
 }
+.lm_editTable_warpper .ant-table-cell {
+  border-right: 0px !important;
+}
 .lm_editTable_warpper .ant-table-cell:empty::before {
   content: '-';
 }
@@ -547,6 +550,15 @@ html {
 .lm_editTable_warpper .ant-form-item-explain-error {
   font-size: 12px;
 }
+.lm_editTable_warpper .lm_table_quickcopy .anticon {
+  color: var(--text-color);
+}
+.lm_editTable_warpper .icon_drag {
+  color: var(--tip-text-color);
+}
+.lm_editTable_warpper .icon_drag:hover {
+  color: var(--text-color);
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;

package/lib/LmFilter/LmFilter.js

@@ -39,6 +39,8 @@ var LmFilter = function LmFilter(_ref, ref) {
     // 是否启用高级筛选
     enableCustom: false,
     // 是否启用自定义筛选
+    enableClear: true,
+    // 是否展示一件清空
     size: 'middle',
     // 尺寸
     searchKey: 'search',

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/customFilter/index.js

@@ -94,7 +94,8 @@ var LmFilterCustom = function LmFilterCustom(_ref) {
     overlayClassName: "filter_dropdown_container_custom",
     onVisibleChange: function onVisibleChange(v) {
       return setVisible(v);
-    }
+    },
+    destroyPopupOnHide: true
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('lm_filter_custom_select', {
       expand: visible,

package/lib/LmFilter/customFilter/saveModal.js

@@ -99,7 +99,6 @@ var Save = function Save(_ref) {
                 });
               }
 
-              console.log('保存数据！', nValue);
               onClose();
               dispatch({
                 type: 'changeCustomDrawer',
@@ -108,20 +107,20 @@ var Save = function Save(_ref) {
                 })
               });
               (_instance$onSave = instance.onSave) === null || _instance$onSave === void 0 ? void 0 : _instance$onSave.call(instance, resetOptions(nValue));
-              _context.next = 15;
+              _context.next = 14;
               break;
 
-            case 12:
-              _context.prev = 12;
+            case 11:
+              _context.prev = 11;
               _context.t0 = _context["catch"](0);
               console.log('error:', _context.t0);
 
-            case 15:
+            case 14:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 12]]);
+      }, _callee, null, [[0, 11]]);
     }));
 
     return function onSave() {

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'
     };
@@ -373,10 +379,11 @@ var useCoreOptions = function useCoreOptions(_ref) {
         type: item.type,
         value: Array.isArray(itemValue) ? itemValue : [itemValue],
         operator: item.operator || 'equal'
-      }));
+      })); // 数据清楚时不返回结构体
 
       if (!(0, _utils.getIsHas)(itemValue)) {
         delete basicFilter[field];
+        delete basicQuery[field];
       }
 
       ; // 触发外部事件
@@ -429,7 +436,6 @@ var useCoreOptions = function useCoreOptions(_ref) {
     var customFilter = customOptions.find(function (v) {
       return v.value === val;
     });
-    console.log('state.basicFilter', state.basicFilter);
     onQuery({
       customFilter: customFilter,
       basicFilter: state.basicFilter,

package/lib/LmFilter/wrapper/Filter.js

@@ -22,7 +22,8 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var enableBaisc = instance.enableBaisc,
       enableComplex = instance.enableComplex,
-      enableCustom = instance.enableCustom;
+      enableCustom = instance.enableCustom,
+      enableClear = instance.enableClear;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter"
   }, enableCustom && /*#__PURE__*/_react.default.createElement(_customFilter.default, {
@@ -31,7 +32,7 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
     instance: instance
   }), enableComplex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, {
     instance: instance
-  }), /*#__PURE__*/_react.default.createElement(_clearFilter.default, {
+  }), enableClear && /*#__PURE__*/_react.default.createElement(_clearFilter.default, {
     instance: instance
   }));
 });

package/lib/LmSelect/NormalSelect.js

@@ -63,7 +63,7 @@ var NormalSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       showSearch = props.showSearch,
       others = __rest(props, ["children", "className", "dropdownClassName", "type", "options", "showSearch"]);
 
-  var _React$useState = _react.default.useState([]),
+  var _React$useState = _react.default.useState(others.defaultValue || []),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       checkedValues = _React$useState2[0],
       setCheckedValues = _React$useState2[1];
@@ -82,6 +82,10 @@ var NormalSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     setCheckedValues(v);
     (_a = props === null || props === void 0 ? void 0 : props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v, renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.filter(function (item) {
+      if (typeof v === 'boolean') {
+        return v === item.value;
+      }
+
       return v === null || v === void 0 ? void 0 : v.includes(item.value);
     }));
   });

package/lib/LmSelect/style/index.css

@@ -704,7 +704,8 @@ html {
   transition: 0.3s;
   opacity: 0;
 }
-.select_dropdown .filter_body .filter_item[disabled] {
+.select_dropdown .filter_body .filter_item[disabled],
+.select_dropdown .filter_body .filter_item.disabled {
   display: none;
 }
 .select_dropdown .filter_body .filter_item.checked {

package/lib/LmSelect/useCheckboxOptions.d.ts

@@ -1,4 +1,4 @@
-export declare const useCheckboxOptions: (options: any, { value, onChange: onCheckChange }: {
+export declare const useCheckboxOptions: (options: any, { value, onChange }: {
     value?: any[];
     onChange: any;
 }, filter?: string) => JSX.Element;

package/lib/LmSelect/useCheckboxOptions.js

@@ -130,7 +130,8 @@ var useCheckboxOptions = function useCheckboxOptions(options, _ref) {
 
     return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, resetProps, {
       className: (0, _classnames.default)('filter_item', {
-        checked: checkedValues.includes(item.value)
+        checked: checkedValues.includes(item.value),
+        disabled: item.disabled
       }),
       onClick: function onClick(e) {
         return onChange(e, item);