@zhenliang/sheet 0.1.81 → 0.1.82

package/dist/core/reducers/mouseReducer.js

@@ -76,7 +76,9 @@ export var mouseReducer = {
       row = _ref2.row,
       col = _ref2.col;
     var data = state.data;
-    if (state.mouseDown === false || isFreezedCell(row, col, data)) return state;
+    if (state.mouseDown === false || isFreezedCell(row, col, data)) {
+      return state;
+    }
     if (state.isIndex && state.start && state.end && (data === null || data === void 0 ? void 0 : data[row][col].dataIndex) === 'index') {
       var _state$end;
       return _objectSpread(_objectSpread({}, state), {}, {
@@ -106,7 +108,9 @@ export var mouseReducer = {
       row = _ref3.row,
       col = _ref3.col;
     var data = state.data;
-    if (state.mouseDown === false || isFreezedCell(row, col, data)) return state;
+    if (state.mouseDown === false || isFreezedCell(row, col, data)) {
+      return state;
+    }
     if (state.isIndex && state.end) {
       var _state$end2;
       return _objectSpread(_objectSpread({}, state), {}, {
@@ -192,12 +196,12 @@ export var mouseReducer = {
     });
   },
   mouseLeaveInterval: function mouseLeaveInterval(state, payload) {
-    var _data$, _end$col;
+    var _data$, _end$col, _data$2, _end$col2;
     var _ref5 = payload,
       end = _ref5.end;
     var data = state.data;
-    // fixed 列不选中
-    if (data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && (_data$ = _data$[(_end$col = end.col) !== null && _end$col !== void 0 ? _end$col : 0]) !== null && _data$ !== void 0 && _data$.fixed) {
+    //fixed 列不选中
+    if (data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && (_data$ = _data$[(_end$col = end.col) !== null && _end$col !== void 0 ? _end$col : 0]) !== null && _data$ !== void 0 && _data$.fixed && !(data !== null && data !== void 0 && (_data$2 = data[0]) !== null && _data$2 !== void 0 && (_data$2 = _data$2[(_end$col2 = end.col) !== null && _end$col2 !== void 0 ? _end$col2 : 0]) !== null && _data$2 !== void 0 && _data$2.fixedAllowSelect)) {
       return state;
     }
     return _objectSpread(_objectSpread({}, state), {}, {

package/dist/core/sheet/useMouseEvent.js

@@ -1,6 +1,6 @@
 import { useMouse } from "../..";
 import { useCallback, useEffect, useRef } from 'react';
-import { extractDataRowAndCol, findParentTd, isSiblingControl } from "../util";
+import { extractDataRowAndCol, findParentTd, isFreezedCell, isSiblingControl } from "../util";
 var rowCount = 10; //每秒10行
 var colCount = 5; //每秒5列
 
@@ -131,7 +131,10 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     e.preventDefault();
     if (!((_elementRef$current5 = elementRef.current) !== null && _elementRef$current5 !== void 0 && _elementRef$current5.contains(e.target))) return;
     var currentCell = findParentTd(e.target);
-    if (!currentCell || currentCell.classList.contains('fixed')) return;
+    // if (!currentCell || currentCell.classList.contains('fixed')) return;
+    if (!currentCell) {
+      return;
+    }
     (_elementRef$current6 = elementRef.current) === null || _elementRef$current6 === void 0 || _elementRef$current6.style.setProperty('scroll-behavior', 'smooth');
     var currentPos = extractDataRowAndCol(currentCell);
     dispatch({
@@ -141,8 +144,13 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     dispatch(function (d, getState) {
       var _elementRef$current7;
       var _getState = getState(),
-        mouseDown = _getState.mouseDown;
-      if (!mouseDown || !elementRef.current) return;
+        mouseDown = _getState.mouseDown,
+        data = _getState.data;
+      var row = currentPos.row,
+        col = currentPos.col;
+      if (!mouseDown || !elementRef.current || isFreezedCell(row, col, data)) {
+        return;
+      }
       var cellBounding = currentCell.getBoundingClientRect();
       var parentBounding = (_elementRef$current7 = elementRef.current) === null || _elementRef$current7 === void 0 ? void 0 : _elementRef$current7.getBoundingClientRect();
       var left = cellBounding.left,
@@ -193,7 +201,8 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
 
     resetInterval();
     var currentCell = findParentTd(e.target);
-    if (!currentCell || currentCell.classList.contains('fixed')) {
+    // if (!currentCell || currentCell.classList.contains('fixed')) {
+    if (!currentCell) {
       dispatch({
         type: 'changes',
         payload: {

package/dist/core/shell/draggableShell/index.js

@@ -146,7 +146,9 @@ export var DraggableShell = function DraggableShell(_ref) {
           className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed), (_item$titleConfig3 = item.titleConfig) === null || _item$titleConfig3 === void 0 ? void 0 : _item$titleConfig3.className, isLastFixedLeft && isScrolledOver ? "last-fixed-left" : '', isFirstFixedRight && !isScrolledToEnd ? "first-fixed-right" : ''),
           colSpan: (_item$titleConfig4 = item.titleConfig) === null || _item$titleConfig4 === void 0 ? void 0 : _item$titleConfig4.colSpan,
           onClick: function onClick(e) {
-            if (item.fixed) return;
+            if (item.fixed && !item.fixedAllowSelect) {
+              return;
+            }
             var target = e.target;
             if (e.nativeEvent.offsetX <= target.offsetWidth - 8) {
               var _item$titleConfig5;

package/dist/core/table/useGroupConfig.js

@@ -167,6 +167,7 @@ export var formatGroupData = function formatGroupData(param) {
           dataIndex: colInfo.dataIndex,
           key: colInfo.key,
           allowClear: colInfo.allowClear,
+          fixedAllowSelect: colInfo.fixedAllowSelect,
           col: col
         });
       });

package/dist/core/table/useRowSelection.js

@@ -85,6 +85,7 @@ export var formatSelectionData = function formatSelectionData(param) {
         col: col,
         dataIndex: colInfo.dataIndex,
         allowClear: colInfo.allowClear,
+        fixedAllowSelect: colInfo.fixedAllowSelect,
         key: colInfo.key
       });
     });

package/dist/core/util.js

@@ -459,7 +459,7 @@ export var calcMenuPosition = function calcMenuPosition(_ref5) {
 };
 export var isFreezedCell = function isFreezedCell(row, col, data) {
   var _data$row$col$classNa;
-  var isFreezed = (data === null || data === void 0 ? void 0 : data[row][col].fixed) || (data === null || data === void 0 || (_data$row$col$classNa = data[row][col].className) === null || _data$row$col$classNa === void 0 ? void 0 : _data$row$col$classNa.includes('sheet-control'));
+  var isFreezed = (data === null || data === void 0 ? void 0 : data[row][col].fixed) && !(data !== null && data !== void 0 && data[row][col].fixedAllowSelect) || (data === null || data === void 0 || (_data$row$col$classNa = data[row][col].className) === null || _data$row$col$classNa === void 0 ? void 0 : _data$row$col$classNa.includes('sheet-control'));
   return !!isFreezed;
 };
 export var stripRowIndex = function stripRowIndex(data) {
@@ -507,7 +507,7 @@ export var isSearchElement = function isSearchElement(tableRootNode, target) {
   var _tableRootNode$nextSi2;
   return (_tableRootNode$nextSi2 = tableRootNode.nextSibling) === null || _tableRootNode$nextSi2 === void 0 || (_tableRootNode$nextSi2 = _tableRootNode$nextSi2.nextSibling) === null || _tableRootNode$nextSi2 === void 0 ? void 0 : _tableRootNode$nextSi2.contains(target);
 };
-var punctuationMap = new Map([["，", ","], ["：", ":"], ["；", ";"]]);
+var punctuationMap = new Map([['，', ','], ['：', ':'], ['；', ';']]);
 export var noramlizeSearch = function noramlizeSearch(target) {
   if (!target) {
     return target;
@@ -515,7 +515,7 @@ export var noramlizeSearch = function noramlizeSearch(target) {
   var lower = target.toLowerCase();
   // 逗号分号
   punctuationMap.forEach(function (value, key) {
-    lower = lower.replace(new RegExp(key, "g"), value);
+    lower = lower.replace(new RegExp(key, 'g'), value);
   });
   return lower;
 };
@@ -528,10 +528,10 @@ export var searchInclude = function searchInclude(search, compare) {
 };
 export var getTextWidth = function getTextWidth(text) {
   // 创建隐藏的临时元素
-  var tempElement = document.createElement("span");
-  tempElement.style.visibility = "hidden";
-  tempElement.style.whiteSpace = "pre"; // 保持空格和换行的格式
-  tempElement.style.display = "inline-block";
+  var tempElement = document.createElement('span');
+  tempElement.style.visibility = 'hidden';
+  tempElement.style.whiteSpace = 'pre'; // 保持空格和换行的格式
+  tempElement.style.display = 'inline-block';
   tempElement.textContent = text;
   document.body.appendChild(tempElement);
   var width = tempElement.offsetWidth;

package/dist/example/antComponent.js

@@ -107,7 +107,8 @@ var columns = [{
   readonly: function readonly(value, record, row) {
     return row === 1;
   },
-  fixed: 'left'
+  fixed: 'left',
+  fixedAllowSelect: true
 }, {
   title: 'date',
   width: 150,

package/dist/type/sheet.d.ts

@@ -30,6 +30,7 @@ export type Cell = {
     fixed?: Omit<CellAlign, 'center'>;
     value?: string | number | null;
     allowClear?: boolean;
+    fixedAllowSelect?: boolean;
 };
 export type FixedInfo = {
     isFirstFixedRight: boolean;

package/dist/type/sheetTable.d.ts

@@ -39,6 +39,7 @@ export type ColumnProps = {
     render?: SheetType.CellViewer;
     editor?: SheetType.CellEditor;
     searchKey?: (value: unknown, record: Record<string, unknown>) => string;
+    fixedAllowSelect?: boolean | RecordRowMap<boolean>;
 };
 export type TableChange = {
     col?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",