@zhenliang/sheet 0.2.5-beta.1 → 0.2.5-beta.4

package/dist/core/editor/InputOptionsEditor/index.js

@@ -12,7 +12,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Dropdown, Menu, Tooltip } from 'antd';
-import { head, isEmpty, isNil } from 'lodash';
+import { get, head, isEmpty, isNil } from 'lodash';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { flattenOptions, getStringDiff, replaceLabelsWithValues, replaceLongestDiff, replaceValuesWithLabels, tokenize, validateVariables, getCursorPositionInSpan } from "./utils";
@@ -34,11 +34,12 @@ var getSpanAtCursor = function getSpanAtCursor(startContainer) {
 };
 export var getFormulaInputEditor = function getFormulaInputEditor(options, replaceIndex) {
   var FormulaInputEditor = function FormulaInputEditor(props) {
+    var _get;
     var originValue = props.value,
       onChange = props.onChange,
       isEditing = props.isEditing,
       record = props.record;
-    var calcValue = replaceIndex ? record === null || record === void 0 ? void 0 : record[replaceIndex] : originValue;
+    var calcValue = replaceIndex ? "".concat((_get = get(record, [replaceIndex])) !== null && _get !== void 0 ? _get : '') : originValue;
     var _useState = useState(calcValue),
       _useState2 = _slicedToArray(_useState, 1),
       inputValue = _useState2[0];
@@ -74,7 +75,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
     }, [inputValue, flatOptions]);
     // 根据搜索文本获取筛选后的层级选项（保持层级结构）
     var filteredHierarchyOptions = useMemo(function () {
-      var searchText = inputAfterDropDownShow;
+      var searchText = inputAfterDropDownShow.trim();
       // 如果搜索文本为空，显示所有选项（保持层级）
       if (!searchText) {
         return options;
@@ -216,7 +217,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       if (open) {
         var _getStringDiff2 = getStringDiff(containerValueSnapShot.current, newValue),
           addedOnSnapShot = _getStringDiff2.added;
-        isBeginWithNumber = /^\d$/.test(head(addedOnSnapShot));
+        isBeginWithNumber = /^\d$/.test(head(addedOnSnapShot.join('').trim()));
         inputStringAfterDropDownShow = addedOnSnapShot.join('');
       }
       if (pressAOperator) {
@@ -371,6 +372,16 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
 
       // 删除键逻辑
       if (e.key !== 'Delete' && e.key !== 'Backspace') return;
+      if (e.key === 'Backspace') {
+        // 检查删除后是否只剩一个空的 span
+        var allSpansNow = Array.from(div.querySelectorAll('span'));
+        var isOnlyOneEmptySpan = allSpansNow.length === 1 && allSpansNow[0].textContent === '';
+        if (isOnlyOneEmptySpan) {
+          e.preventDefault();
+          e.stopPropagation();
+          return;
+        }
+      }
 
       // 不在 label span 内，在 span 开头且前一个是 label 时，删除整个 label span
       if (startOffset === 0 && e.key === 'Backspace' && currentIndex > 0) {
@@ -571,13 +582,13 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         spellCheck: false,
         children: isEmpty(tokens) ? /*#__PURE__*/_jsx("span", {
           style: {
-            minWidth: 8,
+            minWidth: 1,
             height: 40
           }
         }) : tokens.map(function (token, index) {
           return token.type === 'end' ? /*#__PURE__*/_jsx("span", {
             style: {
-              minWidth: 8,
+              minWidth: 1,
               height: 40
             }
           }, index) : /*#__PURE__*/_jsx("span", {

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

@@ -4,12 +4,13 @@
   white-space: nowrap;
   overflow: hidden;
   outline: none;
-  min-width: 95%;
+  min-width: 90%;
   max-height: 100%;
   box-shadow: inset 0 -100px 0 rgba(33, 133, 208, 15%);
   position: absolute;
   top: 0;
   background: #fff;
+  padding-right: 8px;
 }
 
 .formula-editor-equal {

package/dist/core/editor/InputOptionsEditor/utils.js

@@ -115,6 +115,9 @@ var splitSegmentByLabels = function splitSegmentByLabels(segment, sortedLabels)
  * 有效 label 为 type 'label'，其他为 'other'
  */
 export var tokenize = function tokenize(text, flatOptions) {
+  if (!text) {
+    return [];
+  }
   var tokens = [];
 
   // 将 value 转换为 label

package/dist/core/table/useRowSelection.d.ts

@@ -1,5 +1,5 @@
 import { SheetTableType } from "../..";
 export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
-export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "showRemark" | "rowSelection"> & {
+export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "showRemark" | "rowSelection" | "dataSource" | "rowKey"> & {
     checked: boolean[];
 }) => any[][];

package/dist/example/basic.js

@@ -175,6 +175,14 @@ var data = [{
   tags: ['cool', 'teacher'],
   formula: '=(123 + 456) * price + 888',
   amount: 100
+}, {
+  key: '6',
+  name: 'Joe 23',
+  age: 41,
+  address: 'Sidney No. 1 Lake Park',
+  tags: ['cool', 'teacher'],
+  formula: null,
+  amount: 100
 }];
 var App = function App() {
   var _useState = useState(data),

package/package.json

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