linkmore-design 1.1.13-alpha.1 → 1.1.13-alpha.3

package/es/InputNumber/index.js

@@ -16,17 +16,24 @@ var __rest = this && this.__rest || function (s, e) {
 
 import classNames from 'classnames';
 import React from 'react';
+import DisabledContext from '../ConfigProvider/DisabledContext';
 var prefixCls = 'lm_input-number';
 
 var LMInputNumber = function LMInputNumber(props) {
   var children = props.children,
       className = props.className,
-      others = __rest(props, ["children", "className"]);
+      customDisabled = props.disabled,
+      rest = __rest(props // ===================== Disabled =====================
+  , ["children", "className", "disabled"]); // ===================== Disabled =====================
 
+
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled || disabled;
   return /*#__PURE__*/React.createElement(_InputNumber, Object.assign({
     className: classNames(className, prefixCls),
+    disabled: mergedDisabled,
     placeholder: "\u8BF7\u8F93\u5165"
-  }, others));
+  }, rest));
 };
 
 var CInputNumber = LMInputNumber;

package/es/InputNumber/style/index.css

@@ -510,8 +510,12 @@ html {
 p {
   margin-bottom: 0;
 }
+.lm_input-number {
+  width: 100%;
+}
 .lm_input-number.ant-input-number {
   border: 1px solid var(--color-15);
+  width: 100%;
 }
 .lm_input-number .ant-input-number-handler-wrap {
   width: 28px;

package/es/InputNumber/style/variables.css

@@ -1,5 +1,9 @@
+.lm_input-number {
+  width: 100%;
+}
 .lm_input-number.ant-input-number {
   border: 1px solid var(--color-15);
+  width: 100%;
 }
 .lm_input-number .ant-input-number-handler-wrap {
   width: 28px;

package/es/LmEditTable/EditTable.d.ts

@@ -13,6 +13,7 @@ interface ILmEditTable extends TableProps<any> {
     sortOpen?: boolean;
     size?: TableProps<any>['size'];
     colSortOpen?: boolean;
+    indexCol?: boolean | Record<string, any>;
     filterChange?: (data: TableProps<any>['columns']) => void;
     recordCreatorProps?: {
         creatorButtonText?: string;

package/es/LmEditTable/EditTable.js

@@ -54,7 +54,7 @@ import { PlusCircleOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { arrayMove } from '@dnd-kit/sortable';
 import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker, Form, Popover } from 'linkmore-design';
-import { get, set, isFunction, omit, isEqual, pick } from 'lodash';
+import { get, set, isFunction, omit, isEqual, pick, isBoolean } from 'lodash';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, memo, useCallback } from 'react';
 import { useControllableValue } from 'ahooks';
 import { produce } from 'immer';
@@ -290,7 +290,7 @@ var Opetate = function Opetate(_ref) {
         fontSize: 16
       }
     })
-  })) : /*#__PURE__*/React.createElement(Button, {
+  })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/React.createElement(Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(IconFont, {
@@ -302,7 +302,7 @@ var Opetate = function Opetate(_ref) {
     onClick: function onClick() {
       return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
     }
-  }));
+  }) : null);
 };
 /*
   表格单元格
@@ -595,7 +595,7 @@ var EditableCell = function EditableCell(props) {
           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
-          }));
+          }), rowIndex);
         }
 
       default:
@@ -730,6 +730,8 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       virtual = props.virtual,
       sortOpen = props.sortOpen,
       colSortOpen = props.colSortOpen,
+      _props$indexCol = props.indexCol,
+      indexCol = _props$indexCol === void 0 ? false : _props$indexCol,
       filterChange = props.filterChange,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
@@ -737,7 +739,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       _props$shouldUpdate = props.shouldUpdate,
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
       resetProps = __rest(props // const [dataSource, setDataSource] = useState([]);
-  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
+  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
 
 
   var _useControllableValue = useControllableValue({
@@ -1082,7 +1084,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
       title: '排序',
-      dataIndex: 'sort',
+      dataIndex: '_sort',
       width: 48,
       maxWidth: 48,
       className: 'drag-visible',
@@ -1092,7 +1094,25 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
           id: record[_rowKey] || record.id
         });
       }
-    } : null].concat(_toConsumableArray(rColumns), [useQuickOpetate ? {
+    } : null, indexCol ? isBoolean(indexCol) ? {
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        return "".concat(index + 1);
+      }
+    } : Object.assign({
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        return "".concat(index + 1);
+      }
+    }, indexCol || {}) : null].concat(_toConsumableArray(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -1130,8 +1150,15 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     var mapColumns = function mapColumns(col, index) {
       var _a, _b;
 
-      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
-        return col;
+      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length) && (col === null || col === void 0 ? void 0 : col.dataIndex) === '_sort') {
+        var fn = col === null || col === void 0 ? void 0 : col.render;
+        return Object.assign(Object.assign({}, col), {
+          render: function render(text, record, i) {
+            var _a;
+
+            return fn === null || fn === void 0 ? void 0 : fn((_a = dataSource[i]) === null || _a === void 0 ? void 0 : _a[col.dataIndex], dataSource[i], i);
+          }
+        });
       }
 
       var newCol = Object.assign(Object.assign({}, col), {

package/es/LmEditTable/sortableItemCol.js

@@ -15,14 +15,15 @@ import React, { forwardRef } from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 var Item = /*#__PURE__*/forwardRef(function (_a, ref) {
-  var _b;
-
   var children = _a.children,
       props = __rest(_a, ["children"]);
 
-  return /*#__PURE__*/React.createElement("th", Object.assign({}, props, {
+  return /*#__PURE__*/React.createElement("th", Object.assign({}, props, children.props, {
     ref: ref
-  }), ((_b = children === null || children === void 0 ? void 0 : children.props) === null || _b === void 0 ? void 0 : _b.children) || children);
+  })); // <th {...props} ref={ref as any}>
+  //   {/* {(children as any)?.props?.children || children} */}
+  //   { children }
+  // </th>
 });
 export default function SortableItem(props) {
   var _useSortable = useSortable({
@@ -36,7 +37,9 @@ export default function SortableItem(props) {
 
   var style = {
     position: 'relative',
-    transform: CSS.Translate.toString(transform),
+    transform: CSS.Translate.toString(transform ? Object.assign(Object.assign({}, transform), {
+      y: 0
+    }) : transform),
     transition: transition,
     touchAction: 'none',
     height: '40px',

package/es/LmEditTable/util.js

@@ -61,7 +61,7 @@ export function getExpandStatus(children) {
   return isExpandRow(children) ? (_e = (_d = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.children) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.props) === null || _e === void 0 ? void 0 : _e['aria-label'] : '';
 }
 export function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -71,12 +71,21 @@ export function checkMemoShouldUploadSpecialFun(prev, next) {
 
   var prevCol = prev === null || prev === void 0 ? void 0 : prev.col;
   var nextCol = next === null || next === void 0 ? void 0 : next.col;
+  /** TODO: 使用了自定义render, 是否要判断rowIndex? 这样排序之后，渲染的性能就会变差 */
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.render) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.render)) && !isEqual(pick(prev, ['colIndex', 'record', 'children']), pick(next, ['colIndex', 'record', 'children']))) {
+    return false;
+  }
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.editable) === 'render' || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.editable) === 'render') && (((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.render) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.render)) && !isEqual(pick(prev, ['colIndex', 'record', 'rowIndex']), pick(next, ['colIndex', 'record', 'rowIndex']))) {
+    return false;
+  }
 
   if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.fixed) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.fixed)) && !isEqual(prev === null || prev === void 0 ? void 0 : prev.style, next === null || next === void 0 ? void 0 : next.style)) {
     return false;
   }
 
-  if ((((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.optionOnly)) && !isEqual((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.options, (_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.options)) {
+  if ((((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.optionOnly) || ((_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.optionOnly)) && !isEqual((_e = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _e === void 0 ? void 0 : _e.options, (_f = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _f === void 0 ? void 0 : _f.options)) {
     // return isEqual(prevCol?.componentProps?.options, nextCol?.componentProps?.options)
     return false;
   }
@@ -87,12 +96,12 @@ export function checkMemoShouldUploadSpecialFun(prev, next) {
   }
 
   if (next.className.indexOf('ant-table-selection-column') > -1) {
-    return isEqual((_f = (_e = prev.children) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.props, (_h = (_g = next.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props);
+    return isEqual((_h = (_g = prev.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props, (_k = (_j = next.children) === null || _j === void 0 ? void 0 : _j[1]) === null || _k === void 0 ? void 0 : _k.props);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  if (((_j = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _j === void 0 ? void 0 : _j.quickcopy) || ((_k = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _k === void 0 ? void 0 : _k.quickcopy)) {
+  if (((_l = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _l === void 0 ? void 0 : _l.quickcopy) || ((_m = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _m === void 0 ? void 0 : _m.quickcopy)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = pick(prev, pickProps);
     var n = pick(next, pickProps);

package/es/LmFilter/LmFilter.js

@@ -21,9 +21,10 @@ var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
 var _localization = require("./localization");
 
-var _excluded = ["searchConfig", "localization"];
+var _components = _interopRequireDefault(require("./components"));
 
-var LmFilter = function LmFilter(_ref, ref) {
+var _excluded = ["searchConfig", "localization"];
+var LmFilter = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _ref$searchConfig = _ref.searchConfig,
       searchConfig = _ref$searchConfig === void 0 ? {} : _ref$searchConfig,
       _ref$localization = _ref.localization,
@@ -64,8 +65,7 @@ var LmFilter = function LmFilter(_ref, ref) {
   return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
     ref: ref || defaultRef
   }, defaultProps, resetProps));
-};
-
-var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);
-
+});
+LmFilter.FilterControl = _components.default;
+var _default = LmFilter;
 exports.default = _default;

package/es/LmFilter/components/CheckboxFilter.js

@@ -43,7 +43,9 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
       visible = instance.visible,
       setVisible = instance.setVisible;
   var _itemProps$data = itemProps.data,
-      filters = _itemProps$data === void 0 ? [] : _itemProps$data;
+      filters = _itemProps$data === void 0 ? [] : _itemProps$data,
+      showSearch = itemProps.showSearch,
+      showAllChecked = itemProps.showAllChecked;
   var inputRef = (0, _react.useRef)(); // 选中的数据项: [key, key, ...];
 
   var _useState = (0, _react.useState)(filterValue),
@@ -62,8 +64,11 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
   var delayedFn = (0, _hooks.useDelayedFn)(); // 是否存在搜索, 当数据大于8时存在搜索
 
   var isSearch = (0, _react.useMemo)(function () {
-    return filters.length > 8;
-  }, [filters.length]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
+    return filters.length > 8 && !!(showSearch !== null && showSearch !== void 0 ? showSearch : true);
+  }, [filters.length, showSearch]);
+  var isAllCheck = (0, _react.useMemo)(function () {
+    return !!(showAllChecked !== null && showAllChecked !== void 0 ? showAllChecked : true);
+  }, [showAllChecked]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
 
   var checkAll = (0, _react.useMemo)(function () {
     var isAll = checkedValues.length >= options.length;
@@ -145,7 +150,7 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
     ref: inputRef,
     onSearch: handleFilter,
     onChange: handleFilter
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }), isAllCheck && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_header_operate"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: indeterminate,