@univerjs/sheets-sort 1.4.0 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -5
- package/lib/cjs/index.js +12 -12
- package/lib/es/index.js +12 -12
- package/lib/index.js +12 -12
- package/lib/types/facade/f-range.d.ts +4 -0
- package/lib/umd/index.js +1 -1
- package/package.json +7 -7
package/README.md
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
|
|
9
9
|
## Package Overview
|
|
10
10
|
|
|
11
|
-
| Package | UMD global | CSS | Locales | Facade entry |
|
|
12
|
-
| --- | --- | :---: | :---: | :---: |
|
|
13
|
-
| `@univerjs/sheets-sort` | `UniverSheetsSort` | No | No | Yes |
|
|
11
|
+
| Package | UMD global | CSS | Locales | Facade entry | Worker entry |
|
|
12
|
+
| --- | --- | :---: | :---: | :---: | :---: |
|
|
13
|
+
| `@univerjs/sheets-sort` | `UniverSheetsSort` | No | No | Yes | No |
|
|
14
14
|
|
|
15
15
|
## Installation
|
|
16
16
|
|
|
@@ -20,10 +20,10 @@ pnpm add @univerjs/sheets-sort
|
|
|
20
20
|
npm install @univerjs/sheets-sort
|
|
21
21
|
```
|
|
22
22
|
|
|
23
|
-
Keep all `@univerjs/*` packages on the same version.
|
|
24
|
-
|
|
25
23
|
## Usage
|
|
26
24
|
|
|
25
|
+
Start with the [integration setup](https://docs.univer.ai/) for your document type, including its required plugins, styles, and locale resources. The snippet below assumes that setup is complete.
|
|
26
|
+
|
|
27
27
|
```ts
|
|
28
28
|
import { UniverSheetsSortPlugin } from '@univerjs/sheets-sort';
|
|
29
29
|
|
|
@@ -33,6 +33,7 @@ univer.registerPlugin(UniverSheetsSortPlugin);
|
|
|
33
33
|
## Integration Notes
|
|
34
34
|
|
|
35
35
|
Use this package with `@univerjs/sheets-sort-ui` when users need sorting menus and panels.
|
|
36
|
+
- Import `@univerjs/sheets-sort/facade` when using this package through Univer Facade APIs.
|
|
36
37
|
|
|
37
38
|
## Resources
|
|
38
39
|
|
package/lib/cjs/index.js
CHANGED
|
@@ -58,7 +58,7 @@ const isNullValue = (cell) => {
|
|
|
58
58
|
return false;
|
|
59
59
|
};
|
|
60
60
|
|
|
61
|
-
// \0@oxc-project+runtime@0.
|
|
61
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
|
|
62
62
|
function _typeof(o) {
|
|
63
63
|
"@babel/helpers - typeof";
|
|
64
64
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -68,25 +68,25 @@ function _typeof(o) {
|
|
|
68
68
|
}, _typeof(o);
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
// \0@oxc-project+runtime@0.
|
|
72
|
-
function toPrimitive(t,
|
|
71
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
|
|
72
|
+
function toPrimitive(t, e) {
|
|
73
73
|
if ("object" != _typeof(t) || !t) return t;
|
|
74
|
-
var
|
|
75
|
-
if (void 0 !==
|
|
76
|
-
var i =
|
|
74
|
+
var r;
|
|
75
|
+
if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
|
|
76
|
+
var i = r.call(t, e || "default");
|
|
77
77
|
if ("object" != _typeof(i)) return i;
|
|
78
78
|
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
79
79
|
}
|
|
80
|
-
return ("string" ===
|
|
80
|
+
return ("string" === e ? String : Number)(t);
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
// \0@oxc-project+runtime@0.
|
|
83
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
|
|
84
84
|
function toPropertyKey(t) {
|
|
85
85
|
var i = toPrimitive(t, "string");
|
|
86
86
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
87
87
|
}
|
|
88
88
|
|
|
89
|
-
// \0@oxc-project+runtime@0.
|
|
89
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
|
|
90
90
|
function _defineProperty(e, r, t) {
|
|
91
91
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
92
92
|
value: t,
|
|
@@ -96,14 +96,14 @@ function _defineProperty(e, r, t) {
|
|
|
96
96
|
}) : e[r] = t, e;
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
// \0@oxc-project+runtime@0.
|
|
99
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
|
|
100
100
|
function __decorateParam(paramIndex, decorator) {
|
|
101
101
|
return function(target, key) {
|
|
102
102
|
decorator(target, key, paramIndex);
|
|
103
103
|
};
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
-
// \0@oxc-project+runtime@0.
|
|
106
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
|
|
107
107
|
function __decorate(decorators, target, key, desc) {
|
|
108
108
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
109
109
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -321,7 +321,7 @@ SheetsSortController = __decorate([__decorateParam(0, _univerjs_core.ICommandSer
|
|
|
321
321
|
|
|
322
322
|
// package.json
|
|
323
323
|
var name = "@univerjs/sheets-sort";
|
|
324
|
-
var version = "1.
|
|
324
|
+
var version = "1.5.0";
|
|
325
325
|
|
|
326
326
|
// src/config/config.ts
|
|
327
327
|
/**
|
package/lib/es/index.js
CHANGED
|
@@ -57,7 +57,7 @@ const isNullValue = (cell) => {
|
|
|
57
57
|
return false;
|
|
58
58
|
};
|
|
59
59
|
|
|
60
|
-
// \0@oxc-project+runtime@0.
|
|
60
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
|
|
61
61
|
function _typeof(o) {
|
|
62
62
|
"@babel/helpers - typeof";
|
|
63
63
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -67,25 +67,25 @@ function _typeof(o) {
|
|
|
67
67
|
}, _typeof(o);
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
// \0@oxc-project+runtime@0.
|
|
71
|
-
function toPrimitive(t,
|
|
70
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
|
|
71
|
+
function toPrimitive(t, e) {
|
|
72
72
|
if ("object" != _typeof(t) || !t) return t;
|
|
73
|
-
var
|
|
74
|
-
if (void 0 !==
|
|
75
|
-
var i =
|
|
73
|
+
var r;
|
|
74
|
+
if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
|
|
75
|
+
var i = r.call(t, e || "default");
|
|
76
76
|
if ("object" != _typeof(i)) return i;
|
|
77
77
|
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
78
78
|
}
|
|
79
|
-
return ("string" ===
|
|
79
|
+
return ("string" === e ? String : Number)(t);
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
// \0@oxc-project+runtime@0.
|
|
82
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
|
|
83
83
|
function toPropertyKey(t) {
|
|
84
84
|
var i = toPrimitive(t, "string");
|
|
85
85
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
// \0@oxc-project+runtime@0.
|
|
88
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
|
|
89
89
|
function _defineProperty(e, r, t) {
|
|
90
90
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
91
91
|
value: t,
|
|
@@ -95,14 +95,14 @@ function _defineProperty(e, r, t) {
|
|
|
95
95
|
}) : e[r] = t, e;
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
// \0@oxc-project+runtime@0.
|
|
98
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
|
|
99
99
|
function __decorateParam(paramIndex, decorator) {
|
|
100
100
|
return function(target, key) {
|
|
101
101
|
decorator(target, key, paramIndex);
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
// \0@oxc-project+runtime@0.
|
|
105
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
|
|
106
106
|
function __decorate(decorators, target, key, desc) {
|
|
107
107
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
108
108
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -320,7 +320,7 @@ SheetsSortController = __decorate([__decorateParam(0, ICommandService), __decora
|
|
|
320
320
|
|
|
321
321
|
// package.json
|
|
322
322
|
var name = "@univerjs/sheets-sort";
|
|
323
|
-
var version = "1.
|
|
323
|
+
var version = "1.5.0";
|
|
324
324
|
|
|
325
325
|
// src/config/config.ts
|
|
326
326
|
/**
|
package/lib/index.js
CHANGED
|
@@ -57,7 +57,7 @@ const isNullValue = (cell) => {
|
|
|
57
57
|
return false;
|
|
58
58
|
};
|
|
59
59
|
|
|
60
|
-
// \0@oxc-project+runtime@0.
|
|
60
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
|
|
61
61
|
function _typeof(o) {
|
|
62
62
|
"@babel/helpers - typeof";
|
|
63
63
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -67,25 +67,25 @@ function _typeof(o) {
|
|
|
67
67
|
}, _typeof(o);
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
// \0@oxc-project+runtime@0.
|
|
71
|
-
function toPrimitive(t,
|
|
70
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
|
|
71
|
+
function toPrimitive(t, e) {
|
|
72
72
|
if ("object" != _typeof(t) || !t) return t;
|
|
73
|
-
var
|
|
74
|
-
if (void 0 !==
|
|
75
|
-
var i =
|
|
73
|
+
var r;
|
|
74
|
+
if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
|
|
75
|
+
var i = r.call(t, e || "default");
|
|
76
76
|
if ("object" != _typeof(i)) return i;
|
|
77
77
|
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
78
78
|
}
|
|
79
|
-
return ("string" ===
|
|
79
|
+
return ("string" === e ? String : Number)(t);
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
// \0@oxc-project+runtime@0.
|
|
82
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
|
|
83
83
|
function toPropertyKey(t) {
|
|
84
84
|
var i = toPrimitive(t, "string");
|
|
85
85
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
// \0@oxc-project+runtime@0.
|
|
88
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
|
|
89
89
|
function _defineProperty(e, r, t) {
|
|
90
90
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
91
91
|
value: t,
|
|
@@ -95,14 +95,14 @@ function _defineProperty(e, r, t) {
|
|
|
95
95
|
}) : e[r] = t, e;
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
// \0@oxc-project+runtime@0.
|
|
98
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
|
|
99
99
|
function __decorateParam(paramIndex, decorator) {
|
|
100
100
|
return function(target, key) {
|
|
101
101
|
decorator(target, key, paramIndex);
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
// \0@oxc-project+runtime@0.
|
|
105
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
|
|
106
106
|
function __decorate(decorators, target, key, desc) {
|
|
107
107
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
108
108
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -320,7 +320,7 @@ SheetsSortController = __decorate([__decorateParam(0, ICommandService), __decora
|
|
|
320
320
|
|
|
321
321
|
// package.json
|
|
322
322
|
var name = "@univerjs/sheets-sort";
|
|
323
|
-
var version = "1.
|
|
323
|
+
var version = "1.5.0";
|
|
324
324
|
|
|
325
325
|
// src/config/config.ts
|
|
326
326
|
/**
|
|
@@ -24,6 +24,10 @@ export type SortColumnSpec = {
|
|
|
24
24
|
export interface IFRangeSheetsSortMixin {
|
|
25
25
|
/**
|
|
26
26
|
* Sorts the cells in the given range, by column(s) and order specified.
|
|
27
|
+
*
|
|
28
|
+
* To sort by multiple columns, pass all sort specifications in priority order in one array and call
|
|
29
|
+
* this method once on the full target range. Repeated single-column sorts can change the intended priority.
|
|
30
|
+
*
|
|
27
31
|
* @param {SortColumnSpec | SortColumnSpec[]} column The column index with order or an array of column indexes with order. The range first column index is 0.
|
|
28
32
|
* @returns {FRange} The range itself for chaining.
|
|
29
33
|
* @example
|
package/lib/umd/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets"),require("@univerjs/engine-formula")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets`,`@univerjs/engine-formula`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsSort={},e.UniverCore,e.UniverSheets,e.UniverEngineFormula))})(this,function(e,t,n,r){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});let i=/* @__PURE__ */ function(e){return e.DESC=`desc`,e.ASC=`asc`,e}({}),a=e=>e.replace(/-/gi,``).replace(/'/gi,``),o=(e,t)=>{let n=e===null||e===``,r=t===null||t===``;return n&&r?0:n?1:r?-1:null},s=(e,t,n)=>{let r=typeof e==`number`,i=typeof t==`number`;return r&&i?e<t?n===`asc`?-1:1:e>t?n===`asc`?1:-1:0:r?n===`asc`?1:-1:i?n===`asc`?-1:1:null},c=(e,t,n)=>{let r=typeof e==`string`,i=typeof t==`string`;if(r&&(e=a(e.toLocaleLowerCase())),i&&(t=a(t.toLocaleLowerCase())),!r&&!i)return null;if(r&&i){let r=e,i=t;return r<i?n===`asc`?-1:1:r>i?n===`asc`?1:-1:0}return r?n===`asc`?1:-1:i?n===`asc`?-1:1:null},l=e=>!e||Object.keys(e).length===0||(e==null?void 0:e.v)==null&&(e==null?void 0:e.p)==null;function u(e){"@babel/helpers - typeof";return u=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},u(e)}function d(e,t){if(u(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive]
|
|
1
|
+
(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets"),require("@univerjs/engine-formula")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets`,`@univerjs/engine-formula`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsSort={},e.UniverCore,e.UniverSheets,e.UniverEngineFormula))})(this,function(e,t,n,r){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});let i=/* @__PURE__ */ function(e){return e.DESC=`desc`,e.ASC=`asc`,e}({}),a=e=>e.replace(/-/gi,``).replace(/'/gi,``),o=(e,t)=>{let n=e===null||e===``,r=t===null||t===``;return n&&r?0:n?1:r?-1:null},s=(e,t,n)=>{let r=typeof e==`number`,i=typeof t==`number`;return r&&i?e<t?n===`asc`?-1:1:e>t?n===`asc`?1:-1:0:r?n===`asc`?1:-1:i?n===`asc`?-1:1:null},c=(e,t,n)=>{let r=typeof e==`string`,i=typeof t==`string`;if(r&&(e=a(e.toLocaleLowerCase())),i&&(t=a(t.toLocaleLowerCase())),!r&&!i)return null;if(r&&i){let r=e,i=t;return r<i?n===`asc`?-1:1:r>i?n===`asc`?1:-1:0}return r?n===`asc`?1:-1:i?n===`asc`?-1:1:null},l=e=>!e||Object.keys(e).length===0||(e==null?void 0:e.v)==null&&(e==null?void 0:e.p)==null;function u(e){"@babel/helpers - typeof";return u=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},u(e)}function d(e,t){if(u(e)!=`object`||!e)return e;var n;if(typeof Symbol<`u`&&(n=e[Symbol.toPrimitive])!==void 0){var r=n.call(e,t||`default`);if(u(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function f(e){var t=d(e,`string`);return u(t)==`symbol`?t:t+``}function p(e,t,n){return(t=f(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function m(e,t){return function(n,r){t(n,r,e)}}function h(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let g=class extends t.Disposable{constructor(e,t,n){super(),this._univerInstanceService=e,this._commandService=t,this._formulaDataModel=n,p(this,`_compareFns`,[])}mergeCheck(e){var n;let{unitId:r,subUnitId:i,range:a}=e,o=(n=this._univerInstanceService.getUnit(r))==null?void 0:n.getSheetBySheetId(i);if(!o)return!1;let s=o.getMergeData().filter(e=>t.Rectangle.contains(a,e));return s.length===0||_(a,s)}emptyCheck(e){var t;let{unitId:n,subUnitId:r,range:i}=e,a=(t=this._univerInstanceService.getUnit(n))==null?void 0:t.getSheetBySheetId(r);if(!a)return!1;for(let e=i.startRow;e<=i.endRow;e++)for(let t=i.startColumn;t<=i.endColumn;t++)if(!l(a.getCellRaw(e,t)))return!0;return!1}singleCheck(e){return e.range.startRow!==e.range.endRow}formulaCheck(e){var n;let{unitId:r,subUnitId:i,range:a}=e,o=(n=this._formulaDataModel.getArrayFormulaRange())==null||(n=n[r])==null?void 0:n[i];for(let e in o){let n=o[Number(e)];for(let e in n){let r=n[Number(e)];if(r&&t.Rectangle.intersects(a,r))return!1}}return!0}registerCompareFn(e){this._compareFns.unshift(e)}getAllCompareFns(){return this._compareFns}applySort(e,t,r){let{unitId:i,subUnitId:a}=(0,n.getSheetCommandTarget)(this._univerInstanceService)||{};this._commandService.executeCommand(v.id,{orderRules:e.orderRules,range:e.range,hasTitle:e.hasTitle??!1,unitId:t||i,subUnitId:r||a})}};g=h([m(0,t.IUniverInstanceService),m(1,t.ICommandService),m(2,(0,t.Inject)(r.FormulaDataModel))],g);function _(e,t){let n=e.endRow-e.startRow+1,r=e.endColumn-e.startColumn+1,i=null,a=null,o=n*r,s=0;for(let n of t)if(n.startRow>=e.startRow&&n.endRow<=e.endRow&&n.startColumn>=e.startColumn&&n.endColumn<=e.endColumn){let e=n.endRow-n.startRow+1,t=n.endColumn-n.startColumn+1;if(i===null&&a===null)i=e,a=t;else if(e!==i||t!==a)return!1;s+=e*t}return s===o}let v={id:`sheet.command.sort-range`,type:t.CommandType.COMMAND,handler:(e,r)=>{let{range:i,orderRules:a,hasTitle:o,unitId:s,subUnitId:c}=r,l=e.get(g),u=e.get(t.IUniverInstanceService),{worksheet:d}=(0,n.getSheetCommandTarget)(u,r)||{};if(!d)return!1;let f=d.getMergeData().filter(e=>t.Rectangle.contains(i,e)),p=f.map(e=>e.startRow),{startRow:m,endRow:h}=i,_=o?m+1:m,v=[],S=[];for(let e=_;e<=h;e++)d.getRowFiltered(e)||d.getRowRawVisible(e)!==!1&&(!f.length||p.includes(e))&&(v.push({index:e,value:y(d,e,a)}),S.push(e));let C=l.getAllCompareFns();v.sort(x(a,b(C)));let w={};v.forEach(({index:e,value:t},n)=>{w[S[n]]=e});let T={id:n.ReorderRangeCommand.id,params:{unitId:s,subUnitId:c,range:i,order:w}},E=e.get(t.ICommandService);return(0,t.sequenceExecute)([T],E).result}};function y(e,t,n){let r=[];return n.forEach(({colIndex:n})=>{r.push(e.getCellRaw(t,n))}),r}function b(e){return(t,n,r)=>{for(let i=0;i<e.length;i++){let a=e[i](t,n,r);if(a!=null)return a}return 0}}function x(e,t){return function(n,r){let i=null;for(let a=0;a<e.length;a++){let o=n.value[a],s=r.value[a];if(i=t(e[a].type,o,s),i!==0&&i!=null)return i}return 0}}let S=class extends t.Disposable{constructor(e,t){super(),this._commandService=e,this._sortService=t,this._initCommands(),this._registerCompareFns()}_initCommands(){[v].forEach(e=>this.disposeWithMe(this._commandService.registerCommand(e)))}_registerCompareFns(){this._sortService.registerCompareFn((e,t,n)=>{let r=this._getCommonValue(t),i=this._getCommonValue(n),a=[o,c,s];for(let t=0;t<a.length;t++){let n=a[t](r,i,e);if(n!==null)return n}return null})}_getCommonValue(e){var n;return l(e)?null:(e==null||(n=e.p)==null||(n=n.body)==null?void 0:n.dataStream)||((e==null?void 0:e.t)===t.CellValueType.NUMBER?Number.parseFloat(`${e.v}`):(e==null?void 0:e.t)===t.CellValueType.STRING?typeof e.v==`number`?e.v:`${e.v}`:(e==null?void 0:e.t)===t.CellValueType.BOOLEAN?`${e.v}`:(e==null?void 0:e.t)===t.CellValueType.FORCE_STRING?Number.parseFloat(`${e.v}`):`${e==null?void 0:e.v}`)}};S=h([m(0,t.ICommandService),m(1,(0,t.Inject)(g))],S);var C=`@univerjs/sheets-sort`,w=`1.5.0`;let T={},E=class extends t.Plugin{constructor(e=T,n,r){super(),this._config=e,this._injector=n,this._configService=r;let{...i}=(0,t.merge)({},T,this._config);this._configService.setConfig(`sheets-sort.config`,i)}onStarting(){[[S],[g]].forEach(e=>this._injector.add(e))}onReady(){this._injector.get(S)}};p(E,`type`,t.UniverInstanceType.UNIVER_SHEET),p(E,`pluginName`,`SHEET_SORT_PLUGIN`),p(E,`packageName`,C),p(E,`version`,w),E=h([(0,t.DependentOn)(r.UniverFormulaEnginePlugin,n.UniverSheetsPlugin),m(1,(0,t.Inject)(t.Injector)),m(2,t.IConfigService)],E),Object.defineProperty(e,"SheetsSortController",{enumerable:!0,get:function(){return S}}),Object.defineProperty(e,"SheetsSortService",{enumerable:!0,get:function(){return g}}),e.SortRangeCommand=v,e.SortType=i,Object.defineProperty(e,"UniverSheetsSortPlugin",{enumerable:!0,get:function(){return E}})});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@univerjs/sheets-sort",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Sorting model, commands, and services for Univer Sheets.",
|
|
6
6
|
"author": "DreamNum Co., Ltd. <developer@univer.ai>",
|
|
@@ -59,14 +59,14 @@
|
|
|
59
59
|
"lib"
|
|
60
60
|
],
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@univerjs/core": "1.
|
|
63
|
-
"@univerjs/engine-formula": "1.
|
|
64
|
-
"@univerjs/sheets": "1.
|
|
62
|
+
"@univerjs/core": "1.5.0",
|
|
63
|
+
"@univerjs/engine-formula": "1.5.0",
|
|
64
|
+
"@univerjs/sheets": "1.5.0"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@univerjs-infra/shared": "1.
|
|
68
|
-
"tsrs": "0.
|
|
69
|
-
"vitest": "^5.0
|
|
67
|
+
"@univerjs-infra/shared": "1.5.0",
|
|
68
|
+
"tsrs": "0.23.0-ts7.1.0-beta",
|
|
69
|
+
"vitest": "^5.1.0"
|
|
70
70
|
},
|
|
71
71
|
"scripts": {
|
|
72
72
|
"test": "vitest run",
|