@zhenliang/sheet 0.1.4 → 0.1.7-3.beta.0

package/dist/core/editor/selectEditor/index.less

@@ -1,22 +1,28 @@
-.select-editor,.ant-select-selector {
+.harvest-sheet-container .select-editor {
   // select style
   width: 100%;
   line-height: 20px;
-  height: 20px;
+  height:38px;
+  display: block;
 
     .ant-select-selector {
+      width: 100%;
+      height: inherit !important;
       border: none !important;
       background: transparent !important;
       box-shadow: none !important;
       color: #292c33;
-      height: 20px !important;
       padding:0 !important; 
     }
 
+    .ant-select-selection-search{
+      height: 38px;
+    }
+
     .ant-select-selection-item {
       color: #292c33;
+      line-height: 38px !important;
       font-size: 12px;
-      line-height: unset !important;
     }
 
     .ant-select-arrow {
@@ -36,6 +42,11 @@
     box-shadow: inset 0 -100px 0 rgba(33,133,208,15%);
   }
 
+  .ant-select-item {
+    font-size: 12px !important;
+  }
+}
 
-
+.select-editor-dropdown{
+  min-width: 80px !important;
 }

package/dist/core/reducers/index.d.ts

@@ -1,6 +1,6 @@
 import type { SheetType } from "../../type";
-export declare type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'selectRow' | 'select' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
-export declare type reducerAction = (type: Partial<SheetType.UpdateStateType>, payload?: unknown) => Partial<SheetType.UpdateStateType>;
+export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'selectOneRow' | 'changeSearch' | 'closeSearch' | 'openSearch' | 'changeFixedPosition' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
+export type reducerAction = (type: Partial<SheetType.UpdateStateType>, payload?: unknown) => Partial<SheetType.UpdateStateType>;
 declare const sheetReducer: (state: Partial<SheetType.UpdateStateType>, action: {
     type: SheetAction;
     payload?: unknown;

package/dist/core/reducers/index.js

@@ -10,11 +10,15 @@ var sheetReducer = function sheetReducer(state, action) {
     case 'editFinish':
     case 'pushHistory':
     case 'popHistory':
-    case 'selectRow':
     case 'select':
+    case 'selectOneRow':
     case 'clearSelect':
     case 'clearSelectIfNotSingleRow':
     case 'clearEdit':
+    case 'changeSearch':
+    case 'closeSearch':
+    case 'openSearch':
+    case 'changeFixedPosition':
       return stateReducer[action.type](state, action.payload);
     case 'mouseDown':
     case 'mouseOver':
@@ -22,12 +26,15 @@ var sheetReducer = function sheetReducer(state, action) {
     case 'loseFocus':
     case 'doubleClick':
     case 'mouseLeaveInterval':
+    case 'selectRow':
+    case 'selectCol':
       return mouseReducer[action.type](state, action.payload);
     case 'move':
     case 'escape':
     case 'reverse':
     case 'delete':
     case 'enter':
+    case 'selectAll':
     case 'otherInput':
       return keyboardReducer[action.type](state, action.payload);
     default:

package/dist/core/reducers/keyboardReducer.js

@@ -1,11 +1,11 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { isNil } from 'lodash';
-import { getNextVisibleRow, groupConfigToGroupMap } from "../util";
+import { getNextVisibleRow, groupConfigToGroupMap, stripRowIndex } from "../util";
 export var keyboardReducer = {
   move: function move(state, payload) {
     var _state$start, _state$start2;
@@ -17,7 +17,8 @@ export var keyboardReducer = {
       data = _state$data === void 0 ? [] : _state$data;
     var newRow = (((_state$start = state.start) === null || _state$start === void 0 ? void 0 : _state$start.row) || 0) + row;
     if (groupConfig) {
-      newRow = getNextVisibleRow(newRow, data.length, groupConfigToGroupMap(groupConfig), row < 0 ? -1 : 1);
+      var _data;
+      newRow = getNextVisibleRow(newRow, (data === null || data === void 0 || (_data = data[data.length - 1]) === null || _data === void 0 ? void 0 : _data[0].row) || data.length, groupConfigToGroupMap(groupConfig), row < 0 ? -1 : 1);
     }
     var currentPos = {
       row: newRow,
@@ -65,12 +66,12 @@ export var keyboardReducer = {
     return state;
   },
   enter: function enter(state, payload) {
-    var _data$start$row;
+    var _data$start$row, _data$start$row2;
     var start = state.start,
       end = state.end,
       editing = state.editing,
       data = state.data;
-    if (!start || !end || data !== null && data !== void 0 && (_data$start$row = data[start.row]) !== null && _data$start$row !== void 0 && _data$start$row[start.col].readonly) {
+    if (!start || !end || data !== null && data !== void 0 && (_data$start$row = data[start.row]) !== null && _data$start$row !== void 0 && _data$start$row[start.col].readonly || !(data !== null && data !== void 0 && (_data$start$row2 = data[start.row]) !== null && _data$start$row2 !== void 0 && _data$start$row2[start.col].editable)) {
       return state;
     }
     if (!editing) {
@@ -89,5 +90,34 @@ export var keyboardReducer = {
   otherInput: function otherInput(state, payload) {
     if (state.editing) return state;
     return keyboardReducer.enter(state, payload);
+  },
+  selectAll: function selectAll(state) {
+    var _state$data2 = state.data,
+      data = _state$data2 === void 0 ? [] : _state$data2;
+    var lastEditing;
+    if (state.editing) {
+      lastEditing = _objectSpread(_objectSpread({}, state.editing), {}, {
+        confirm: true
+      });
+    }
+    var _stripRowIndex = stripRowIndex(data),
+      startIndex = _stripRowIndex.startIndex,
+      endIndex = _stripRowIndex.endIndex;
+    return _objectSpread(_objectSpread({}, state), {}, {
+      start: {
+        row: 0,
+        col: startIndex
+      },
+      end: {
+        row: data.length - 1,
+        col: endIndex
+      },
+      lastSelected: {
+        start: state.start,
+        end: state.end
+      },
+      editing: undefined,
+      lastEditing: lastEditing
+    });
   }
 };

package/dist/core/reducers/mouseReducer.js

@@ -1,9 +1,10 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { isFreezedCell, stripRowIndex } from "../util";
 export var mouseReducer = {
   mouseDown: function mouseDown(state, payload) {
     var _ref = payload,
@@ -14,7 +15,12 @@ export var mouseReducer = {
     var data = state.data,
       start = state.start,
       end = state.end;
-    if (data !== null && data !== void 0 && data[row][col].fixed) {
+    if ((data === null || data === void 0 ? void 0 : data[row][col].dataIndex) === 'index') {
+      return mouseReducer.selectRow(state, {
+        row: row
+      });
+    }
+    if (isFreezedCell(row, col, data)) {
       return _objectSpread(_objectSpread({}, state), {}, {
         start: undefined,
         end: undefined,
@@ -70,7 +76,20 @@ export var mouseReducer = {
       row = _ref2.row,
       col = _ref2.col;
     var data = state.data;
-    if (state.mouseDown === false || data !== null && data !== void 0 && data[row][col].fixed) 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), {}, {
+        end: {
+          row: row,
+          col: (_state$end = state.end) === null || _state$end === void 0 ? void 0 : _state$end.col
+        },
+        lastSelected: {
+          start: state.start,
+          end: state.end
+        }
+      });
+    }
     return _objectSpread(_objectSpread({}, state), {}, {
       end: {
         row: row,
@@ -87,9 +106,25 @@ export var mouseReducer = {
       row = _ref3.row,
       col = _ref3.col;
     var data = state.data;
-    if (state.mouseDown === false || data !== null && data !== void 0 && data[row][col].fixed) return state;
+    if (state.mouseDown === false || isFreezedCell(row, col, data)) return state;
+    if (state.isIndex && state.end) {
+      var _state$end2;
+      return _objectSpread(_objectSpread({}, state), {}, {
+        mouseDown: false,
+        isIndex: false,
+        end: {
+          row: row,
+          col: (_state$end2 = state.end) === null || _state$end2 === void 0 ? void 0 : _state$end2.col
+        },
+        lastSelected: {
+          start: state.start,
+          end: state.end
+        }
+      });
+    }
     return _objectSpread(_objectSpread({}, state), {}, {
       mouseDown: false,
+      isIndex: false,
       end: {
         row: row,
         col: col
@@ -115,7 +150,13 @@ export var mouseReducer = {
       lastSelected: {
         start: state.start,
         end: state.end
-      }
+      },
+      searchText: '',
+      showSearch: false,
+      searchTotal: 0,
+      searchCurrent: 0,
+      searchCalledCount: 0,
+      searchResultList: []
     });
   },
   doubleClick: function doubleClick(state, payload) {
@@ -129,6 +170,7 @@ export var mouseReducer = {
     }
     return _objectSpread(_objectSpread({}, state), {}, {
       mouseDown: false,
+      isIndex: false,
       editing: {
         row: row,
         col: col
@@ -149,16 +191,78 @@ export var mouseReducer = {
     });
   },
   mouseLeaveInterval: function mouseLeaveInterval(state, payload) {
-    var _data$, _data$$end$col;
+    var _data$, _end$col;
     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$$end$col = _data$[end.col]) !== null && _data$$end$col !== void 0 && _data$$end$col.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) {
       return state;
     }
     return _objectSpread(_objectSpread({}, state), {}, {
       end: end
     });
+  },
+  selectRow: function selectRow(state, payload) {
+    var _ref6 = payload,
+      row = _ref6.row;
+    var _state$data = state.data,
+      data = _state$data === void 0 ? [] : _state$data;
+    var lastEditing;
+    var _stripRowIndex = stripRowIndex(data),
+      startIndex = _stripRowIndex.startIndex,
+      endIndex = _stripRowIndex.endIndex;
+    if (state.editing) {
+      lastEditing = _objectSpread(_objectSpread({}, state.editing), {}, {
+        confirm: true
+      });
+    }
+    return _objectSpread(_objectSpread({}, state), {}, {
+      start: {
+        row: row,
+        col: startIndex
+      },
+      end: {
+        row: row,
+        col: endIndex
+      },
+      lastSelected: {
+        start: state.start,
+        end: state.end
+      },
+      mouseDown: true,
+      isIndex: true,
+      editing: undefined,
+      lastEditing: lastEditing
+    });
+  },
+  selectCol: function selectCol(state, payload) {
+    var _ref7 = payload,
+      col = _ref7.col,
+      colSpan = _ref7.colSpan;
+    var _state$data2 = state.data,
+      data = _state$data2 === void 0 ? [] : _state$data2;
+    var lastEditing;
+    if (state.editing) {
+      lastEditing = _objectSpread(_objectSpread({}, state.editing), {}, {
+        confirm: true
+      });
+    }
+    return _objectSpread(_objectSpread({}, state), {}, {
+      start: {
+        row: 0,
+        col: col
+      },
+      end: {
+        row: data.length - 1,
+        col: col + (colSpan > 1 ? colSpan - 1 : 0)
+      },
+      lastSelected: {
+        start: state.start,
+        end: state.end
+      },
+      editing: undefined,
+      lastEditing: lastEditing
+    });
   }
 };

package/dist/core/reducers/sideEffectReducer.d.ts

@@ -1,4 +1,4 @@
 import type { SheetType } from "../../type";
 import { FunctionAction, NormalAction } from '../../hooks';
-export declare type asyncActionType = (dispatch: (action: NormalAction | FunctionAction) => void, getState: () => SheetType.UpdateStateType) => void;
+export type asyncActionType = (dispatch: (action: NormalAction | FunctionAction) => void, getState: () => SheetType.UpdateStateType) => void;
 export declare const sideEffectReducer: Record<string, asyncActionType>;