JLNTV_IPD/tmagic-editor
4
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2025-04-06 03:57:56 +08:00
Code Issues Projects Releases Wiki Activity

fix(core): deep-state-observer update 的data与初始化时相同，导致get data为空

Browse Source
This commit is contained in:
roymondchen 2025-01-20 14:58:20 +08:00
parent e8461f91e6
commit 701a9d6f30
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/tests/App.spec.ts
View File

@ -1,8 +1,9 @@
import { describe, expect, test } from 'vitest'; import { describe, expect, test } from 'vitest';
import { MApp, NodeType, TMagicIteratorContainer } from '@tmagic/schema'; import { MApp, NodeType } from '@tmagic/schema';
import App from '../src/App'; import App from '../src/App';
import TMagicIteratorContainer from '../src/IteratorContainer';
const createAppDsl = (pageLength: number, nodeLength = 0) => { const createAppDsl = (pageLength: number, nodeLength = 0) => {
const dsl: MApp = { const dsl: MApp = {

2
packages/data-source/src/DataSourceManager.ts
View File

@ -177,7 +177,7 @@ class DataSourceManager extends EventEmitter {
this.removeDataSource(schema.id); this.removeDataSource(schema.id);
this.addDataSource(schema); this.addDataSource(cloneDeep(schema));
const newDs = this.get(schema.id); const newDs = this.get(schema.id);
if (newDs) { if (newDs) {
this.init(newDs); this.init(newDs);

8
packages/data-source/src/data-sources/Base.ts
View File

@ -62,13 +62,15 @@ export default class DataSource<T extends DataSourceSchema = DataSourceSchema> e
// eslint-disable-next-line @typescript-eslint/naming-convention // eslint-disable-next-line @typescript-eslint/naming-convention
const ObservedDataClass = options.ObservedDataClass || SimpleObservedData; const ObservedDataClass = options.ObservedDataClass || SimpleObservedData;
if (this.app.platform === 'editor') { if (this.app.platform === 'editor') {
const mocks = cloneDeep(options.schema.mocks || []);
// 编辑器中有mock使用mock，没有使用默认值 // 编辑器中有mock使用mock，没有使用默认值
this.mockData = options.schema.mocks?.find((mock) => mock.useInEditor)?.data || this.getDefaultData(); this.mockData = mocks.find((mock) => mock.useInEditor)?.data || this.getDefaultData();
data = cloneDeep(this.mockData); data = cloneDeep(this.mockData);
} else if (typeof options.useMock === 'boolean' && options.useMock) { } else if (typeof options.useMock === 'boolean' && options.useMock) {
const mocks = cloneDeep(options.schema.mocks || []);
// 设置了使用mock就使用mock数据 // 设置了使用mock就使用mock数据
this.mockData = options.schema.mocks?.find((mock) => mock.enable)?.data; this.mockData = mocks.find((mock) => mock.enable)?.data;
data = this.mockData || this.getDefaultData(); data = cloneDeep(this.mockData) || this.getDefaultData();
} else if (!options.initialData) { } else if (!options.initialData) {
data = this.getDefaultData(); data = this.getDefaultData();
} else { } else {