linkmore-design 1.1.26 → 1.1.27-alpha.0

package/lib/LmEditTable/virtual/context.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useStore = exports.useRealive = exports.TableContext = void 0;
+
+var _react = require("react");
+
+// =============== context ============== //
+var TableContext = /*#__PURE__*/(0, _react.createContext)({
+  state: null,
+  dispatch: null,
+  instance: {}
+});
+exports.TableContext = TableContext;
+
+var useStore = function useStore() {
+  return (0, _react.useContext)(TableContext);
+};
+
+exports.useStore = useStore;
+var initialState = {
+  // 行高度
+  rowHeight: 0,
+  columnsLen: 0,
+  // 总行数
+  totalLen: 0
+};
+
+var reducer = function reducer(state, action) {
+  var totalLen = action.totalLen,
+      columnsLen = action.columnsLen,
+      rowHeight = action.rowHeight;
+
+  switch (action.type) {
+    // 数据数量
+    case 'changeTotalLen':
+      return Object.assign(Object.assign({}, state), {
+        totalLen: totalLen
+      });
+    // 列数量
+
+    case 'changeColumnsLen':
+      return Object.assign(Object.assign({}, state), {
+        columnsLen: columnsLen
+      });
+    // 初始化行高度
+
+    case 'initHeight':
+      return Object.assign(Object.assign({}, state), {
+        rowHeight: rowHeight
+      });
+
+    default:
+      throw new Error();
+  }
+};
+
+var useRealive = function useRealive() {
+  return (0, _react.useReducer)(reducer, initialState);
+};
+
+exports.useRealive = useRealive;

package/lib/LmEditTable/virtual/index.d.ts

@@ -0,0 +1,4 @@
+import VirtualTable from './VirtualTable';
+import VirtualWrapper from './VirtualWrapper';
+import VirtualRow from './VirtualRow';
+export { VirtualTable, VirtualWrapper, VirtualRow };

package/lib/LmEditTable/virtual/index.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "VirtualRow", {
+  enumerable: true,
+  get: function get() {
+    return _VirtualRow.default;
+  }
+});
+Object.defineProperty(exports, "VirtualTable", {
+  enumerable: true,
+  get: function get() {
+    return _VirtualTable.default;
+  }
+});
+Object.defineProperty(exports, "VirtualWrapper", {
+  enumerable: true,
+  get: function get() {
+    return _VirtualWrapper.default;
+  }
+});
+
+var _VirtualTable = _interopRequireDefault(require("./VirtualTable"));
+
+var _VirtualWrapper = _interopRequireDefault(require("./VirtualWrapper"));
+
+var _VirtualRow = _interopRequireDefault(require("./VirtualRow"));

package/lib/LmFilter/filterFns/index.js

@@ -188,7 +188,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
           fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
           type: item.type,
           value: Array.isArray(itemValue) ? itemValue : [itemValue],
-          operator: (item === null || item === void 0 ? void 0 : item.operator) || obj[cur].mode === 'and' ? 'equal' : 'contains'
+
+          /**
+           * and 等同于逻辑关系contains: 选中的值包含所有值
+           * or 等同于逻辑关系in: 选中的值存在于所有值之中
+           */
+          operator: obj[cur].mode === 'and' ? 'contains' : 'in'
         }]);
       }
 
@@ -359,7 +364,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
             fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
             type: item.type,
             value: Array.isArray(itemValue) ? itemValue : [itemValue],
-            operator: complexFilter[cur].mode === 'and' ? 'equal' : 'contains'
+            operator: complexFilter[cur].mode === 'and' ? 'contains' : 'in'
           };
         }
 

package/lib/LmTable/virTual/VirtualRow.js

@@ -36,12 +36,16 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = (0, _react.useRef)(null); // 列长度
+  var trRef = (0, _react.useRef)(null); // 非固定列长度
 
   var columnsLen = (0, _react.useMemo)(function () {
     var _a;
 
-    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+    return (_a = children === null || children === void 0 ? void 0 : children.filter(function (v) {
+      var _a, _b;
+
+      return typeof ((_a = v.props) === null || _a === void 0 ? void 0 : _a.fixLeft) !== 'number' && typeof ((_b = v.props) === null || _b === void 0 ? void 0 : _b.fixRight) !== 'number';
+    }).length) !== null && _a !== void 0 ? _a : 0; // return children?.length ?? 0
   }, [children]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== columnsLen) {
@@ -88,26 +92,20 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       fixedRight: [],
       columns: []
     });
-  }, [children]); // 截取非固定列
-
-  var resetVirtualItems = (0, _react.useMemo)(function () {
-    var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
-    return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横线单元格合并
+  }, [children]); // 横线单元格合并
 
   var colSpan = (0, _react.useMemo)(function () {
     var _a;
 
-    var startIndex = ((_a = resetVirtualItems === null || resetVirtualItems === void 0 ? void 0 : resetVirtualItems[0]) === null || _a === void 0 ? void 0 : _a.index) || 0;
-    return startIndex ? startIndex - fixedColumns.fixedLeft.length : startIndex;
-  }, [fixedColumns, resetVirtualItems]);
+    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]);
+  console.log('virtualItems', virtualItems);
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
     ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
   }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/_react.default.createElement("td", {
     colSpan: colSpan
-  }), resetVirtualItems.map(function (virtualCol) {
-    return children[virtualCol.index];
+  }), virtualItems.map(function (virtualCol) {
+    return fixedColumns.columns[virtualCol.index];
   }), fixedColumns.fixedRight);
 });
 

package/lib/hooks/useEvent/index.js

@@ -17,7 +17,7 @@ function useEvent(handler) {
 
   return (0, _react.useCallback)(function () {
     var fn = handlerRef.current;
-    return fn.apply(void 0, arguments);
+    return fn === null || fn === void 0 ? void 0 : fn.apply(void 0, arguments);
   }, []);
 }
 

package/lib/index.d.ts

@@ -51,10 +51,9 @@ export type { TooltipProps } from './Tooltip';
 export { default as Form } from './Form';
 export { default as Spin } from './Spin';
 export { default as LmEditTable } from './LmEditTable';
-export type { CountdownHandle, TLmEditTable } from './LmEditTable/EditTable';
+export type { TLmEditTable, CountdownHandle } from './LmEditTable/EditTable';
 export { default as List } from './List';
 export { default as LMQuickMenu } from './QuickMenu';
-export type { IMenuData, IQuickMenuProps } from './QuickMenu';
 export { default as DatePicker } from './DatePicker';
 export type { DatePickerProps, MonthPickerProps, WeekPickerProps, RangePickerProps } from './DatePicker';
 export { default as Popover } from './Popover';

package/lib/styles/variables.css

@@ -9738,6 +9738,9 @@ p {
   width: 32px;
   padding: 0 8px;
 }
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  height: 100%;
+}
 .lm_editTable_warpper .lm_editTable_cell {
   cursor: pointer;
   height: 40px;
@@ -9749,6 +9752,21 @@ p {
   letter-spacing: 0px;
   color: var(--color-85);
 }
+.lm_editTable_warpper .lm_custom_cell_td {
+  position: relative;
+}
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+}
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
+  margin-right: 8px;
+  flex: none;
+}
+.lm_editTable_warpper .lm_custom_cell_td > .ant-form-item {
+  flex: 1 1 auto;
+}
 .lm_editTable_warpper .lm_custom_cell_td .ant-form-item-control-input-content {
   display: flex;
   flex-direction: row;
@@ -9760,6 +9778,32 @@ p {
 .lm_editTable_warpper .lm_custom_cell_td .ant-table-row-expand-icon {
   margin-top: 6px;
 }
+.lm_editTable_warpper .lm_custom_cell_td .quick_copy_warp {
+  font-size: 8px;
+  position: absolute;
+  left: calc(50% - 10px);
+  z-index: 100;
+  width: 20px;
+  height: 10px;
+  background-color: var(--color-6);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #D8D8D8;
+}
+.lm_editTable_warpper .lm_custom_cell_td .quick_copy_warp:hover {
+  cursor: pointer;
+  background-color: var(--primary-color);
+  color: #fff;
+}
+.lm_editTable_warpper .lm_custom_cell_td .quick_copy_up {
+  top: -4px;
+  left: calc(50% - 10px);
+}
+.lm_editTable_warpper .lm_custom_cell_td .quick_copy_down {
+  bottom: -6px;
+  left: calc(50% - 10px);
+}
 .lm_editTable_warpper .lm_editTable_cell_edit {
   height: 40px;
   padding: 8px 8px !important;
@@ -9771,6 +9815,9 @@ p {
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table-body {
+  scroll-behavior: smooth;
+}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }
@@ -9787,6 +9834,9 @@ p {
 .lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
   background-color: rgba(0, 0, 0, 0.06) !important;
 }
+.lm_editTable_warpper .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  background-color: rgba(0, 0, 0, 0.06) !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -9830,6 +9880,21 @@ p {
 .lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
   background-color: var(--color-15);
 }
+.lm_edittable_col_sort_item {
+  overflow: hidden;
+}
+.lm_editable_col_drag {
+  background-color: #fff;
+  font-size: 12px;
+  display: flex;
+  box-sizing: border-box;
+  transform: translate3d(var(--translate-x, 0), var(--translate-y, 0), 0) scaleX(var(--scale-x, 1)) scaleY(var(--scale-y, 1));
+  transform-origin: 0 0;
+  touch-action: manipulation;
+  scale: 1.05;
+  box-shadow: 0 0 0 calc(1px / var(--scale-x, 1)) rgba(63, 63, 68, 0.05), 0 1px calc(3px / var(--scale-x, 1)) 0 rgba(34, 33, 81, 0.15);
+  padding: 8px;
+}
 .lm_filter_wrapper .lm_filter_container .lm_filter {
   display: flex;
   flex-wrap: wrap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.26",
+  "version": "1.1.27-alpha.0",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -68,7 +68,6 @@
     "@dnd-kit/core": "^5.0.3",
     "@dnd-kit/modifiers": "^5.0.0",
     "@dnd-kit/sortable": "^6.0.1",
-    "@react-hook/resize-observer": "^1.2.6",
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
     "ahooks": "^3.6.2",
@@ -77,6 +76,8 @@
     "antd-img-crop": "^4.2.5",
     "axios": "^0.21.0",
     "classnames": "^2.3.1",
+    "conventional-changelog": "^3.1.25",
+    "conventional-changelog-cli": "^2.2.2",
     "dayjs": "^1.9.7",
     "echarts": "^5.4.0",
     "hex-to-rgba": "^2.0.1",
@@ -95,12 +96,11 @@
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.6",
     "readline-sync": "^1.4.10",
-    "scrollama": "^3.2.0",
-    "use-resize-observer": "^9.0.2"
+    "scrollama": "^3.2.0"
   },
   "peerDependencies": {
-    "react": ">= 17.0.1",
-    "react-dom": ">= 17.0.1"
+    "react": "17.0.1",
+    "react-dom": "17.0.1"
   },
   "browserslist": [
     "> 1%",
@@ -141,8 +141,6 @@
     "react-copy-to-clipboard": "^5.1.0",
     "stylelint": "^13.8.0",
     "stylelint-config-prettier": "^8.0.2",
-    "stylelint-config-standard": "^20.0.0",
-    "conventional-changelog": "^3.1.25",
-    "conventional-changelog-cli": "^2.2.2"
+    "stylelint-config-standard": "^20.0.0"
   }
 }