aldehyde 0.2.442 → 0.2.444
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/lib/layout2/page.d.ts +1 -1
- package/lib/layout2/page.d.ts.map +1 -1
- package/lib/layout2/page.js +2 -2
- package/lib/layout2/page.js.map +1 -1
- package/lib/lowcode-components/lowcode-view/index.d.ts.map +1 -1
- package/lib/lowcode-components/lowcode-view/index.js +12 -3
- package/lib/lowcode-components/lowcode-view/index.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/layout2/page.tsx +2 -2
- package/src/aldehyde/lowcode-components/lowcode-view/index.tsx +14 -4
package/lib/layout2/page.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ type PagePropsType = {
|
|
|
6
6
|
children?: React.ReactNode;
|
|
7
7
|
logo?: string;
|
|
8
8
|
};
|
|
9
|
-
export declare const routeNavigationThemeHome: (theme: ThemeConfig, menus: MenuType[], pathname: string, navigate: NavigateFunction, closeTab: any) =>
|
|
9
|
+
export declare const routeNavigationThemeHome: (theme: ThemeConfig, menus: MenuType[], pathname: string, navigate: NavigateFunction, closeTab: any) => string;
|
|
10
10
|
export declare const handleMenuItemUrl: (id: string, pageType: BlockType["pageType"], query?: {
|
|
11
11
|
[key: string]: string;
|
|
12
12
|
}, customPath?: string, dragDropPageId?: string, fullScreen?: boolean, version?: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAIN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAU9E,OAAO,EAA4B,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG9E,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,eAAO,MAAM,wBAAwB,GAAI,OAAO,WAAW,EAAE,OAAO,QAAQ,EAAE,EAAE,UAAU,MAAM,EAAE,UAAU,gBAAgB,EAAE,aAAQ,
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAIN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAU9E,OAAO,EAA4B,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG9E,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,eAAO,MAAM,wBAAwB,GAAI,OAAO,WAAW,EAAE,OAAO,QAAQ,EAAE,EAAE,UAAU,MAAM,EAAE,UAAU,gBAAgB,EAAE,aAAQ,WAiBrI,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,IAAI,MAAM,EACV,UAAU,SAAS,CAAC,UAAU,CAAC,EAC/B,QAAO;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACrC,aAAa,MAAM,EACnB,iBAAiB,MAAM,EACvB,aAAa,OAAO,EACpB,UAAU,MAAM,WA8DjB,CAAC;AAmDF,eAAO,MAAM,aAAa,GAAU,gBAAc,KAAG,OAAO,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB,CAiBA,CAAC;AAwGF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAOxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
package/lib/layout2/page.js
CHANGED
|
@@ -38,10 +38,10 @@ export const routeNavigationThemeHome = (theme, menus, pathname, navigate, close
|
|
|
38
38
|
if (isHome) { // 当前菜单是默认首页，删除默认首页，跳转指定首页
|
|
39
39
|
setTimeout(() => {
|
|
40
40
|
closeTab(pathname);
|
|
41
|
-
navigate(item.url);
|
|
41
|
+
navigate(`/${item.url}`, { replace: true });
|
|
42
42
|
}, 1);
|
|
43
43
|
}
|
|
44
|
-
return item.url
|
|
44
|
+
return `/${item.url}`;
|
|
45
45
|
};
|
|
46
46
|
export const handleMenuItemUrl = (id, pageType, query = {}, customPath, dragDropPageId, fullScreen, version) => {
|
|
47
47
|
if (customPath)
|
package/lib/layout2/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,KAAK,EAAE,EACZ,SAAS,EACT,MAAM,EACN,QAAQ,EAAE,OAAO,EAClB,MAAM,OAAO,CAAC;AACf,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAgB,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAO1D,WAAW;AACX,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAkB,EAAE,KAAiB,EAAE,QAAgB,EAAE,QAA0B,EAAE,QAAQ,EAAE,EAAE;IACxI,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IACD,IAAI,MAAM,EAAE,CAAC,CAAC,0BAA0B;QACtC,UAAU,CAAC,GAAG,EAAE;YACd,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAA+C,MAAM,OAAO,CAAA;AAMzF,OAAO,iCAAiC,CAAC;AAOzC,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,iBAAiB,oBAAsB,CAAC;AA4CrD,UAAU,KAAK;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAA+C,MAAM,OAAO,CAAA;AAMzF,OAAO,iCAAiC,CAAC;AAOzC,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,iBAAiB,oBAAsB,CAAC;AA4CrD,UAAU,KAAK;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC1C,KAAK,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,QAAA,MAAM,WAAW,GAAI,OAAO,KAAK,sBA6JhC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -107,13 +107,22 @@ const LowcodeView = (props) => {
|
|
|
107
107
|
// 获取初始化组件数据
|
|
108
108
|
const getInitComponentData = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
109
109
|
const { elemConfigs } = layerManager;
|
|
110
|
-
const
|
|
110
|
+
const nodesIds = Object.keys(elemConfigs || {});
|
|
111
|
+
// publicParams 组件公共参数
|
|
112
|
+
const publicParams = Object.keys(initSearchParams).reduce((total, next) => {
|
|
113
|
+
if (!nodesIds.includes(next)) {
|
|
114
|
+
total[next] = initSearchParams[next];
|
|
115
|
+
}
|
|
116
|
+
return total;
|
|
117
|
+
}, {});
|
|
118
|
+
const dataSourceConfigs = nodesIds.reduce((total, next) => {
|
|
111
119
|
const { data: item = {}, base } = elemConfigs[next] || {};
|
|
120
|
+
const temParams = Object.assign(Object.assign({}, publicParams), (initSearchParams[next] || {})); // 指定组件传参,指定传参可覆盖公共
|
|
112
121
|
if ((item.isInitParams || base.type === "PlaceholderComponent") && controllers[next]) {
|
|
113
|
-
controllers[next].changeData(Object.assign(Object.assign({}, elemConfigs[next]), { initSearchParams, type: "initSearchParams" }));
|
|
122
|
+
controllers[next].changeData(Object.assign(Object.assign({}, elemConfigs[next]), { initSearchParams: temParams, type: "initSearchParams" }));
|
|
114
123
|
}
|
|
115
124
|
if (item.sourceType === "sourceId" && item.sourceId && item.isInit) {
|
|
116
|
-
total.push(Object.assign({ sourceId: item.sourceId, chartCode: next }, (item.isInitParams ?
|
|
125
|
+
total.push(Object.assign({ sourceId: item.sourceId, chartCode: next }, (item.isInitParams ? temParams : {})));
|
|
117
126
|
}
|
|
118
127
|
return total;
|
|
119
128
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACzF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,iCAAiC,CAAC;AACzC,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,sBAAsB,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,cAAc,CAAC;AAEtB,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AAErD,WAAW;AACX,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;IACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACd,CAAC;IACD,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,MAAM,GAAG,GAAG,SAAS,CAAC,aAAa,CAAC,QAAQ,CACxC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,EACxD,QAAQ,CACX,CAAC;QACE,WAAW,aAAa,CAAC,gBAAgB,EAAE,kBAAkB,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/F,OAAO,GAAG,CAAC;AACf,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,SAAS,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAC/C,CAAC,CAAA;AAGD,MAAM,iBAAiB,GAAkC;IACrD,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;IAC5B,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC/B,aAAa,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;IACrC,QAAQ,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;IACvC,QAAQ,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;CAC1C,CAAA;AAED,gBAAgB;AAChB,MAAM,UAAU,GAAG;IACf,EAAE,EAAE,qBAAqB;IACzB,EAAE,EAAE,qBAAqB;IACzB,EAAE,EAAE,qBAAqB;IACzB,EAAE,EAAE,oBAAoB;CAC3B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -41,10 +41,10 @@ export const routeNavigationThemeHome = (theme: ThemeConfig, menus: MenuType[],
|
|
|
41
41
|
if (isHome) { // 当前菜单是默认首页，删除默认首页，跳转指定首页
|
|
42
42
|
setTimeout(() => {
|
|
43
43
|
closeTab(pathname);
|
|
44
|
-
navigate(item.url);
|
|
44
|
+
navigate(`/${item.url}`, { replace: true });
|
|
45
45
|
}, 1);
|
|
46
46
|
}
|
|
47
|
-
return item.url
|
|
47
|
+
return `/${item.url}`;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
export const handleMenuItemUrl = (
|
|
@@ -61,7 +61,8 @@ interface Props {
|
|
|
61
61
|
isFullScreen: boolean,
|
|
62
62
|
ddpageId?: string,
|
|
63
63
|
layoutRootPath?: string,
|
|
64
|
-
|
|
64
|
+
// 组件数据源初始化查询参数；公共参数、指定组件参数：例：{公共参数key:value,指定组件Id(大屏编辑页获取):{参数key:value}}
|
|
65
|
+
initSearchParams?: { [key: string]: any },
|
|
65
66
|
style?: CSSProperties,
|
|
66
67
|
}
|
|
67
68
|
|
|
@@ -111,13 +112,22 @@ const LowcodeView = (props: Props) => {
|
|
|
111
112
|
// 获取初始化组件数据
|
|
112
113
|
const getInitComponentData = async () => {
|
|
113
114
|
const { elemConfigs } = layerManager;
|
|
114
|
-
const
|
|
115
|
+
const nodesIds = Object.keys(elemConfigs || {});
|
|
116
|
+
// publicParams 组件公共参数
|
|
117
|
+
const publicParams = Object.keys(initSearchParams).reduce((total, next) => {
|
|
118
|
+
if (!nodesIds.includes(next)) {
|
|
119
|
+
total[next] = initSearchParams[next];
|
|
120
|
+
}
|
|
121
|
+
return total;
|
|
122
|
+
}, {});
|
|
123
|
+
const dataSourceConfigs = nodesIds.reduce((total, next) => {
|
|
115
124
|
const { data: item = {}, base } = elemConfigs[next] || {};
|
|
125
|
+
const temParams = { ...publicParams, ...(initSearchParams[next] || {}) }; // 指定组件传参,指定传参可覆盖公共
|
|
116
126
|
if ((item.isInitParams || base.type === "PlaceholderComponent") && controllers[next]) {
|
|
117
|
-
controllers[next].changeData({ ...elemConfigs[next], initSearchParams, type: "initSearchParams" });
|
|
127
|
+
controllers[next].changeData({ ...elemConfigs[next], initSearchParams: temParams, type: "initSearchParams" });
|
|
118
128
|
}
|
|
119
129
|
if (item.sourceType === "sourceId" && item.sourceId && item.isInit) {
|
|
120
|
-
total.push({ sourceId: item.sourceId, chartCode: next, ...(item.isInitParams ?
|
|
130
|
+
total.push({ sourceId: item.sourceId, chartCode: next, ...(item.isInitParams ? temParams : {}) });
|
|
121
131
|
}
|
|
122
132
|
return total;
|
|
123
133
|
}, []);
|