annil 1.6.3 → 1.6.4
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/CHANGELOG.md +7 -0
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.js +2 -1
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.js.map +1 -1
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.js +1 -1
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.js.map +1 -1
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.js +1 -19
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.js.map +1 -1
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.d.ts +2 -0
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.js +20 -0
- package/dist/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.js.map +1 -0
- package/package.json +1 -1
- package/src/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.ts +3 -2
- package/src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts +2 -2
- package/src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts +1 -33
- package/src/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.ts +34 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,13 @@
|
|
|
4
4
|
|
|
5
5
|
* 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
|
|
6
6
|
|
|
7
|
+
## [1.6.4](https://github.com/missannil/annil/compare/v1.6.3...v1.6.4) (2024-02-12)
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
|
|
12
|
+
* comouted属性初始化依赖去重bug,并添加更新时去重 ([f228e55](https://github.com/missannil/annil/commit/f228e551dce65d97450b9a1aa3c7b3d3eb3e8199))
|
|
13
|
+
|
|
7
14
|
## [1.6.3](https://github.com/missannil/annil/compare/v1.6.2...v1.6.3) (2024-02-05)
|
|
8
15
|
|
|
9
16
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { deepProxy, getProxyOriginalValue } from "./data-tracer";
|
|
2
2
|
import { getPathsValue } from "./getPathsValue";
|
|
3
3
|
import { isEqual } from "./isEqual";
|
|
4
|
+
import { uniqueDependences } from "./uniqueDependences";
|
|
4
5
|
export function computedUpdater(isUpdated = false) {
|
|
5
6
|
for (const key in this.data.__computedCache__) {
|
|
6
7
|
const itemCache = this.data.__computedCache__[key];
|
|
@@ -20,7 +21,7 @@ export function computedUpdater(isUpdated = false) {
|
|
|
20
21
|
[key]: newValue,
|
|
21
22
|
});
|
|
22
23
|
isUpdated = true;
|
|
23
|
-
this.data.__computedCache__[key].dependences = newDependences;
|
|
24
|
+
this.data.__computedCache__[key].dependences = uniqueDependences(newDependences);
|
|
24
25
|
return computedUpdater.call(this, isUpdated);
|
|
25
26
|
}
|
|
26
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,MAAM,UAAU,eAAe,CAAiB,SAAS,GAAG,KAAK;IAC/D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YAExC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAGhE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC;gBAEf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YAGrF,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE3C,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,QAAQ;aAChB,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAGjB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAGjF,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -9,7 +9,7 @@ export function deepProxy(data, dependences, basePath = []) {
|
|
|
9
9
|
if ((val !== undefined) && (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function")) {
|
|
10
10
|
return val.bind(target);
|
|
11
11
|
}
|
|
12
|
-
if (basePath.length !== 0) {
|
|
12
|
+
if (basePath.length !== 0 && dependences[dependences.length - 1].paths.toString() === basePath.toString()) {
|
|
13
13
|
dependences.pop();
|
|
14
14
|
}
|
|
15
15
|
const curPath = basePath.concat(prop);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAmB,MAAS,EAAE,IAAsB;YACrD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAGzB,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,UAAU,CAAC,EAAE,CAAC;gBAE9G,OAAQ,GAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAmB,MAAS,EAAE,IAAsB;YACrD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAGzB,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,UAAU,CAAC,EAAE,CAAC;gBAE9G,OAAQ,GAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC1G,WAAW,CAAC,GAAG,EAAE,CAAC;YACpB,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAG1C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YAExD,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,GAAG,CAAC,OAAe,EAAE,IAAY;YAC/B,MAAM,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAsC,KAAQ;IACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
|
package/dist/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { deepProxy, getProxyOriginalValue } from "./data-tracer";
|
|
2
|
+
import { uniqueDependences } from "./uniqueDependences";
|
|
2
3
|
function isValidDependences(dependences, computedKeys) {
|
|
3
4
|
for (const { paths: path, val } of dependences) {
|
|
4
5
|
if ((val === undefined) && computedKeys.includes(path[0])) {
|
|
@@ -7,25 +8,6 @@ function isValidDependences(dependences, computedKeys) {
|
|
|
7
8
|
}
|
|
8
9
|
return true;
|
|
9
10
|
}
|
|
10
|
-
function uniqueDependences(dependences) {
|
|
11
|
-
if (dependences.length === 1)
|
|
12
|
-
return dependences;
|
|
13
|
-
for (let f = 0; f < dependences.length; f++) {
|
|
14
|
-
const firstPath = dependences[f].paths.join(".") + ".";
|
|
15
|
-
for (let i = f + 1; i < dependences.length; i++) {
|
|
16
|
-
const curPath = dependences[i].paths.join(".") + ".";
|
|
17
|
-
if (firstPath.startsWith(curPath)) {
|
|
18
|
-
dependences.splice(f, 1);
|
|
19
|
-
return uniqueDependences(dependences);
|
|
20
|
-
}
|
|
21
|
-
if (curPath.startsWith(firstPath)) {
|
|
22
|
-
dependences.splice(i, 1);
|
|
23
|
-
return uniqueDependences(dependences);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
return dependences;
|
|
28
|
-
}
|
|
29
11
|
export function initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys = Object.keys(computedConfig), computedCache = {}) {
|
|
30
12
|
for (const key of uninitedkeys) {
|
|
31
13
|
const computedFunc = computedConfig[key];
|
package/dist/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAexD,SAAS,kBAAkB,CAAC,WAAiC,EAAE,YAAsB;IACnF,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,WAAW,EAAE,CAAC;QAC/C,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAGD,OAAO,IAAI,CAAC;AACd,CAAC;AAWD,MAAM,UAAU,uBAAuB,CACrC,OAAgC,EAChC,cAAoC,EACpC,WAAoC,EACpC,eAAyB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EACpD,gBAA+B,EAAE;IAEjC,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,WAAW,GAAyB,EAAE,CAAC;QAE7C,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAGjF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAGvD,IAAI,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAClD,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAG7C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAG9B,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAE7B,aAAa,CAAC,GAAG,CAAC,GAAG;gBACnB,WAAW,EAAE,iBAAiB,CAAC,WAAW,CAAC;gBAC3C,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC;IACvB,CAAC;IAGD,OAAO,uBAAuB,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AACpG,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export function uniqueDependences(dependences) {
|
|
2
|
+
if (dependences.length === 1)
|
|
3
|
+
return dependences;
|
|
4
|
+
for (let f = 0; f < dependences.length; f++) {
|
|
5
|
+
const firstPath = dependences[f].paths.join(".") + ".";
|
|
6
|
+
for (let i = f + 1; i < dependences.length; i++) {
|
|
7
|
+
const curPath = dependences[i].paths.join(".") + ".";
|
|
8
|
+
if (firstPath.startsWith(curPath)) {
|
|
9
|
+
dependences.splice(f, 1);
|
|
10
|
+
return uniqueDependences(dependences);
|
|
11
|
+
}
|
|
12
|
+
if (curPath.startsWith(firstPath)) {
|
|
13
|
+
dependences.splice(i, 1);
|
|
14
|
+
return uniqueDependences(dependences);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return dependences;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=uniqueDependences.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"uniqueDependences.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.ts"],"names":[],"mappings":"AAEA,MAAM,UASG,iBAAiB,CAAC,WAAiC;IAC1D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACvD,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YACrD,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAElC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEzB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAElC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEzB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -3,6 +3,7 @@ import { deepProxy, getProxyOriginalValue } from "./data-tracer";
|
|
|
3
3
|
import { getPathsValue } from "./getPathsValue";
|
|
4
4
|
|
|
5
5
|
import { isEqual } from "./isEqual";
|
|
6
|
+
import { uniqueDependences } from "./uniqueDependences";
|
|
6
7
|
export type ComputedDependence = { paths: string[]; val: unknown };
|
|
7
8
|
|
|
8
9
|
export function computedUpdater(this: Instance, isUpdated = false): boolean {
|
|
@@ -33,8 +34,8 @@ export function computedUpdater(this: Instance, isUpdated = false): boolean {
|
|
|
33
34
|
|
|
34
35
|
isUpdated = true;
|
|
35
36
|
|
|
36
|
-
//
|
|
37
|
-
this.data.__computedCache__[key].dependences = newDependences;
|
|
37
|
+
// 更新依赖,去重
|
|
38
|
+
this.data.__computedCache__[key].dependences = uniqueDependences(newDependences);
|
|
38
39
|
|
|
39
40
|
// 有一个计算属性更新就重新更新所有计算互相,避免后置依赖导致前置依赖错误
|
|
40
41
|
return computedUpdater.call(this, isUpdated);
|
|
@@ -18,8 +18,8 @@ export function deepProxy(
|
|
|
18
18
|
// val有不是函数的情况么？
|
|
19
19
|
return (val as Function).bind(target);
|
|
20
20
|
}
|
|
21
|
-
// 依赖长度不为0时径依赖去重(只留最后一个路径),比如 return this.data.obj.user.name 去重得到的是最后1个路径 ['obj','user','name'] , 不去重则3个依赖路径了 ['obj'], ['obj','user'],['obj','user','name']
|
|
22
|
-
if (basePath.length !== 0) {
|
|
21
|
+
// 依赖长度不为0时径依赖去重(只留最后一个路径),比如 return this.data.obj.user.name 去重得到的是最后1个路径 ['obj','user','name'] , 不去重则3个依赖路径了 ['obj'], ['obj','user'],['obj','user','name'],在这里去重效率高些,外部去重时还要再次遍历,加"dependences[dependences.length - 1].paths.toString() === basePath.toString()"这判断是有可能遇到` this.data.obj[this.data.id].list`的情况,这种情况下,第一个依赖是obj,第二个依赖是id,因为依赖不是一个路径连续向下的,所以不能去重。
|
|
22
|
+
if (basePath.length !== 0 && dependences[dependences.length - 1].paths.toString() === basePath.toString()) {
|
|
23
23
|
dependences.pop();
|
|
24
24
|
}
|
|
25
25
|
const curPath = basePath.concat(prop);
|
package/src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { FinalOptionsOfComponent } from "..";
|
|
|
3
3
|
|
|
4
4
|
import type { ComputedDependence } from "./computedUpdater";
|
|
5
5
|
import { deepProxy, getProxyOriginalValue } from "./data-tracer";
|
|
6
|
+
import { uniqueDependences } from "./uniqueDependences";
|
|
6
7
|
|
|
7
8
|
type ItemCache = {
|
|
8
9
|
dependences: ComputedDependence[];
|
|
@@ -28,39 +29,6 @@ function isValidDependences(dependences: ComputedDependence[], computedKeys: str
|
|
|
28
29
|
return true;
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
/**
|
|
32
|
-
* 依赖去重
|
|
33
|
-
* @example
|
|
34
|
-
* ```ts
|
|
35
|
-
* const dependences = [{path:['a','b']}, {path:['a','b','c']}, {path:['d','e']}, {path:['d']}]
|
|
36
|
-
* const result = uniqueDependences(dependences)
|
|
37
|
-
* // result = [{path:['a','b'] } ,{ path:['d'] }]
|
|
38
|
-
* ```
|
|
39
|
-
*/
|
|
40
|
-
function uniqueDependences(dependences: ComputedDependence[]): ComputedDependence[] {
|
|
41
|
-
if (dependences.length === 1) return dependences;
|
|
42
|
-
for (let f = 0; f < dependences.length; f++) {
|
|
43
|
-
const firstPath = dependences[f].paths.join(".") + ".";
|
|
44
|
-
for (let i = f + 1; i < dependences.length; i++) {
|
|
45
|
-
const curPath = dependences[i].paths.join(".") + ".";
|
|
46
|
-
if (firstPath.startsWith(curPath)) {
|
|
47
|
-
// 例如 path[0] = 'a.b.c.',curPath = 'a.b.'
|
|
48
|
-
dependences.splice(f, 1);
|
|
49
|
-
|
|
50
|
-
return uniqueDependences(dependences);
|
|
51
|
-
}
|
|
52
|
-
if (curPath.startsWith(firstPath)) {
|
|
53
|
-
// 例如 curPath = 'a.b.' path[0] = 'a.b.c.',
|
|
54
|
-
dependences.splice(i, 1);
|
|
55
|
-
|
|
56
|
-
return uniqueDependences(dependences);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
return dependences;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
32
|
/**
|
|
65
33
|
* 把计算属性初始值加入到options.data中并返回缓存(递归函数)
|
|
66
34
|
* @param options - 配置选项
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { ComputedDependence } from "./computedUpdater";
|
|
2
|
+
|
|
3
|
+
export /**
|
|
4
|
+
* 依赖去重
|
|
5
|
+
* @example
|
|
6
|
+
* ```ts
|
|
7
|
+
* const dependences = [{path:['a','b']}, {path:['a','b','c']}, {path:['d','e']}, {path:['d']}]
|
|
8
|
+
* const result = uniqueDependences(dependences)
|
|
9
|
+
* // result = [{path:['a','b'] } ,{ path:['d'] }]
|
|
10
|
+
* ```
|
|
11
|
+
*/
|
|
12
|
+
function uniqueDependences(dependences: ComputedDependence[]): ComputedDependence[] {
|
|
13
|
+
if (dependences.length === 1) return dependences;
|
|
14
|
+
for (let f = 0; f < dependences.length; f++) {
|
|
15
|
+
const firstPath = dependences[f].paths.join(".") + ".";
|
|
16
|
+
for (let i = f + 1; i < dependences.length; i++) {
|
|
17
|
+
const curPath = dependences[i].paths.join(".") + ".";
|
|
18
|
+
if (firstPath.startsWith(curPath)) {
|
|
19
|
+
// 例如 path[0] = 'a.b.c.',curPath = 'a.b.'
|
|
20
|
+
dependences.splice(f, 1);
|
|
21
|
+
|
|
22
|
+
return uniqueDependences(dependences);
|
|
23
|
+
}
|
|
24
|
+
if (curPath.startsWith(firstPath)) {
|
|
25
|
+
// 例如 curPath = 'a.b.' path[0] = 'a.b.c.',
|
|
26
|
+
dependences.splice(i, 1);
|
|
27
|
+
|
|
28
|
+
return uniqueDependences(dependences);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
return dependences;
|
|
34
|
+
}
|