aldehyde 0.2.499 → 0.2.501
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/controls/direct-file-view/index.d.ts.map +1 -1
- package/lib/controls/direct-file-view/index.js +35 -5
- package/lib/controls/direct-file-view/index.js.map +1 -1
- package/lib/layout2/components/search-menu.d.ts.map +1 -1
- package/lib/layout2/components/search-menu.js +6 -2
- package/lib/layout2/components/search-menu.js.map +1 -1
- package/lib/layout2/header.d.ts.map +1 -1
- package/lib/layout2/header.js +8 -4
- package/lib/layout2/header.js.map +1 -1
- package/lib/layout2/sider.d.ts.map +1 -1
- package/lib/layout2/sider.js +7 -3
- package/lib/layout2/sider.js.map +1 -1
- package/lib/layout3/header.d.ts.map +1 -1
- package/lib/layout3/header.js +8 -4
- package/lib/layout3/header.js.map +1 -1
- package/lib/layout3/sider.d.ts.map +1 -1
- package/lib/layout3/sider.js +7 -3
- package/lib/layout3/sider.js.map +1 -1
- package/lib/layout4/header.d.ts.map +1 -1
- package/lib/layout4/header.js +8 -4
- package/lib/layout4/header.js.map +1 -1
- package/lib/layout4/sider.d.ts.map +1 -1
- package/lib/layout4/sider.js +7 -3
- package/lib/layout4/sider.js.map +1 -1
- package/lib/layout5/header.d.ts.map +1 -1
- package/lib/layout5/header.js +8 -4
- package/lib/layout5/header.js.map +1 -1
- package/lib/layout5/sider.d.ts.map +1 -1
- package/lib/layout5/sider.js +7 -3
- package/lib/layout5/sider.js.map +1 -1
- package/lib/lowcode-components/assets/utils.d.ts +2 -0
- package/lib/lowcode-components/assets/utils.d.ts.map +1 -0
- package/lib/lowcode-components/assets/utils.js +13 -0
- package/lib/lowcode-components/assets/utils.js.map +1 -0
- package/lib/lowcode-components/base-text/index.d.ts +1 -0
- package/lib/lowcode-components/base-text/index.d.ts.map +1 -1
- package/lib/lowcode-components/base-text/index.js +12 -6
- package/lib/lowcode-components/base-text/index.js.map +1 -1
- package/lib/lowcode-components/base-text/index.less +19 -19
- package/lib/lowcode-components/lowcode-view/component/component-container.d.ts.map +1 -1
- package/lib/lowcode-components/lowcode-view/component/component-container.js +50 -15
- package/lib/lowcode-components/lowcode-view/component/component-container.js.map +1 -1
- package/lib/lowcode-components/lowcode-view/interface.d.ts +6 -0
- package/lib/lowcode-components/lowcode-view/interface.d.ts.map +1 -1
- package/lib/table/act-table.d.ts +2 -0
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +32 -19
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/column/column-builder.d.ts +1 -1
- package/lib/table/column/column-builder.d.ts.map +1 -1
- package/lib/table/column/column-builder.js +8 -5
- package/lib/table/column/column-builder.js.map +1 -1
- package/lib/table/index.css +28 -12
- package/lib/table/query-table.d.ts.map +1 -1
- package/lib/table/query-table.js +20 -6
- package/lib/table/query-table.js.map +1 -1
- package/lib/table/resizable-table.js +3 -3
- package/lib/table/resizable-table.js.map +1 -1
- package/lib/tmpl/interface.d.ts +7 -0
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/lib/welcome/HCWelcome.js +9 -7
- package/lib/welcome/HCWelcome.js.map +1 -1
- package/lib/welcome/components/page-card.d.ts +1 -0
- package/lib/welcome/components/page-card.d.ts.map +1 -1
- package/lib/welcome/components/page-card.js +4 -1
- package/lib/welcome/components/page-card.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/direct-file-view/index.tsx +40 -8
- package/src/aldehyde/layout2/components/search-menu.tsx +6 -2
- package/src/aldehyde/layout2/header.tsx +8 -4
- package/src/aldehyde/layout2/sider.tsx +8 -3
- package/src/aldehyde/layout3/header.tsx +8 -4
- package/src/aldehyde/layout3/sider.tsx +7 -3
- package/src/aldehyde/layout4/header.tsx +8 -4
- package/src/aldehyde/layout4/sider.tsx +7 -3
- package/src/aldehyde/layout5/header.tsx +8 -4
- package/src/aldehyde/layout5/sider.tsx +7 -3
- package/src/aldehyde/lowcode-components/assets/utils.ts +11 -0
- package/src/aldehyde/lowcode-components/base-text/index.less +19 -19
- package/src/aldehyde/lowcode-components/base-text/index.tsx +14 -12
- package/src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx +60 -7
- package/src/aldehyde/lowcode-components/lowcode-view/interface.ts +6 -0
- package/src/aldehyde/table/act-table.tsx +37 -23
- package/src/aldehyde/table/column/column-builder.tsx +6 -5
- package/src/aldehyde/table/index.css +28 -12
- package/src/aldehyde/table/query-table.tsx +19 -5
- package/src/aldehyde/table/resizable-table.tsx +2 -2
- package/src/aldehyde/tmpl/interface.tsx +8 -1
- package/src/aldehyde/welcome/HCWelcome.js +9 -7
- package/src/aldehyde/welcome/components/page-card.tsx +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AASvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAA;AAEzB,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AA2BF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA0JnC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/layout4/sider.js
CHANGED
|
@@ -8,9 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ConfigProvider, Layout, Menu, Space, Tooltip, theme } from "antd";
|
|
11
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
11
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
12
12
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
13
13
|
import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "../layout2/util/menu-util";
|
|
14
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
14
15
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
15
16
|
import { useLocale } from "../locale/useLocale";
|
|
16
17
|
import IconFont from "../layout2/components/icon-font";
|
|
@@ -44,6 +45,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
44
45
|
const [openKeys, setOpenKeys] = useState([]);
|
|
45
46
|
const { sourceId } = useParams();
|
|
46
47
|
const [search] = useSearchParams();
|
|
48
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
47
49
|
const menuId = search.get("menuId");
|
|
48
50
|
const { token: { colorPrimary } } = useToken();
|
|
49
51
|
const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -73,8 +75,10 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
73
75
|
display: "block",
|
|
74
76
|
} }, translate("${" + label + "}")));
|
|
75
77
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
78
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
79
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
|
|
76
80
|
if (Array.isArray(children) && !children.length) {
|
|
77
|
-
const navLink = React.createElement(NavLink, { to: `/${path}`, target: target, style: {
|
|
81
|
+
const navLink = React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target, style: {
|
|
78
82
|
color: "inherit",
|
|
79
83
|
width: "100%",
|
|
80
84
|
height: "100%",
|
|
@@ -110,7 +114,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
110
114
|
setOpenKeys(temIds);
|
|
111
115
|
}, 10);
|
|
112
116
|
}
|
|
113
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
117
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
114
118
|
// default select keys
|
|
115
119
|
useEffect(() => {
|
|
116
120
|
var _a;
|
package/lib/layout4/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkE,MAAM,OAAO,CAAC;AAavF,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,CAAC;AA4B3B,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAGF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwJrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/lib/layout5/header.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState, useEffect, useMemo } from "react";
|
|
1
|
+
import React, { useContext, useState, useEffect, useMemo } from "react";
|
|
2
2
|
import { Layout, Space, theme, Button, Dropdown, Breadcrumb, ConfigProvider } from "antd";
|
|
3
3
|
import { NavLink, useParams, useSearchParams, useLocation } from "react-router-dom";
|
|
4
4
|
import { LeftOutlined, RightOutlined, UnorderedListOutlined } from '@ant-design/icons';
|
|
@@ -12,6 +12,7 @@ import ScreenfullButton from "../layout2/components/screenfull-button";
|
|
|
12
12
|
import SystemMessages from "../layout2/components/system-messages";
|
|
13
13
|
import UserNotification from "../layout2/components/user-notification";
|
|
14
14
|
import { useLocale } from "../locale/useLocale";
|
|
15
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
15
16
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
16
17
|
import IconFont from "../layout2/components/icon-font";
|
|
17
18
|
import "./css/header.less";
|
|
@@ -51,6 +52,7 @@ const Header = ({ menuList, themeConfig }) => {
|
|
|
51
52
|
const { pathname } = useLocation();
|
|
52
53
|
const { sourceId } = useParams();
|
|
53
54
|
const [search] = useSearchParams();
|
|
55
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
54
56
|
const menuId = search.get("menuId");
|
|
55
57
|
const handleMenu = (menuItem, floor) => {
|
|
56
58
|
const { disabled, label, children, icon } = menuItem;
|
|
@@ -63,11 +65,13 @@ const Header = ({ menuList, themeConfig }) => {
|
|
|
63
65
|
return React.createElement("div", { style: { cursor: "not-allowed" } }, renderItem);
|
|
64
66
|
}
|
|
65
67
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
68
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
69
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
|
|
66
70
|
if (floor === 0) {
|
|
67
|
-
return path === null ? (renderItem) : (React.createElement(NavLink, { to: `/${path}`, target: target }, renderItem));
|
|
71
|
+
return path === null ? (renderItem) : (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target }, renderItem));
|
|
68
72
|
}
|
|
69
73
|
if (Array.isArray(children) && !children.length) {
|
|
70
|
-
return (React.createElement(NavLink, { to: `/${path}`, target: target }, renderItem));
|
|
74
|
+
return (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target }, renderItem));
|
|
71
75
|
}
|
|
72
76
|
return renderItem;
|
|
73
77
|
};
|
|
@@ -79,7 +83,7 @@ const Header = ({ menuList, themeConfig }) => {
|
|
|
79
83
|
if ((menuList === null || menuList === void 0 ? void 0 : menuList.length) && selParentId) {
|
|
80
84
|
setMenu(handlePropsMenuToAntdMenu(menuList, handleMenu));
|
|
81
85
|
}
|
|
82
|
-
}, [menuList, getLocale(), selParentId]);
|
|
86
|
+
}, [menuList, getLocale(), selParentId, tabs]);
|
|
83
87
|
useEffect(() => {
|
|
84
88
|
if (sourceId === undefined) {
|
|
85
89
|
if (menuList[0] !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAiB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAUvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAC;AAE1B,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AA2BF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAwLnC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/layout5/sider.js
CHANGED
|
@@ -8,10 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ConfigProvider, Layout, Menu, Space, Tooltip, theme } from "antd";
|
|
11
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
11
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
12
12
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
13
13
|
import { generate } from "@ant-design/colors";
|
|
14
14
|
import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "../layout2/util/menu-util";
|
|
15
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
15
16
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
16
17
|
import { useLocale } from "../locale/useLocale";
|
|
17
18
|
import IconFont from "../layout2/components/icon-font";
|
|
@@ -45,6 +46,7 @@ const Sider = ({ menuList, collapsed, systemName, logoImg, themeConfig, customHo
|
|
|
45
46
|
const [openKeys, setOpenKeys] = useState([]);
|
|
46
47
|
const { sourceId } = useParams();
|
|
47
48
|
const [search] = useSearchParams();
|
|
49
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
48
50
|
const menuId = search.get("menuId");
|
|
49
51
|
const { token: { colorPrimary } } = useToken();
|
|
50
52
|
const colors = generate(colorPrimary);
|
|
@@ -75,8 +77,10 @@ const Sider = ({ menuList, collapsed, systemName, logoImg, themeConfig, customHo
|
|
|
75
77
|
display: "block",
|
|
76
78
|
} }, translate("${" + label + "}")));
|
|
77
79
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
80
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
81
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
|
|
78
82
|
if (Array.isArray(children) && !children.length) {
|
|
79
|
-
const navLink = React.createElement(NavLink, { to: `/${path}`, target: target, style: {
|
|
83
|
+
const navLink = React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target, style: {
|
|
80
84
|
color: "inherit",
|
|
81
85
|
width: "100%",
|
|
82
86
|
height: "100%",
|
|
@@ -112,7 +116,7 @@ const Sider = ({ menuList, collapsed, systemName, logoImg, themeConfig, customHo
|
|
|
112
116
|
setOpenKeys(temIds);
|
|
113
117
|
}, 10);
|
|
114
118
|
}
|
|
115
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
119
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
116
120
|
// default select keys
|
|
117
121
|
useEffect(() => {
|
|
118
122
|
var _a;
|
package/lib/layout5/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/assets/utils.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,OASpD,CAAA"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// 处理扩展样式
|
|
2
|
+
export const handleExpandStyle = (expandStyle) => {
|
|
3
|
+
var _a;
|
|
4
|
+
const arrStyle = ((_a = expandStyle === null || expandStyle === void 0 ? void 0 : expandStyle.split(";")) === null || _a === void 0 ? void 0 : _a.map(item => item.split(":"))) || [];
|
|
5
|
+
const temStyle = arrStyle.reduce((total, cur) => {
|
|
6
|
+
if (cur[0] && cur[1]) {
|
|
7
|
+
return Object.assign(Object.assign({}, total), { [cur[0].trim()]: cur[1].trim() });
|
|
8
|
+
}
|
|
9
|
+
return total;
|
|
10
|
+
}, {});
|
|
11
|
+
return temStyle || {};
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/assets/utils.ts"],"names":[],"mappings":"AAAA,SAAS;AACT,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAE,EAAE;;IACrD,MAAM,QAAQ,GAAG,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,GAAG,CAAC,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAI,EAAE,CAAC;IAC7E,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAC5C,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACnB,uCAAY,KAAK,KAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAG;QACxD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,QAAQ,IAAI,EAAE,CAAC;AAC1B,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/base-text/index.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/base-text/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA0F,MAAM,OAAO,CAAC;AAG/G,OAAO,cAAc,CAAC;AAEtB,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CACvB;AAED,MAAM,WAAW,oBAAoB;IACjC,YAAY,EAAE,CAAC,SAAS,EAAE,sBAAsB,KAAK,IAAI,CAAC;CAC7D;AAED,QAAA,MAAM,iBAAiB,qGA4BrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import React, { forwardRef, useImperativeHandle, useState } from 'react';
|
|
1
|
+
import React, { forwardRef, useImperativeHandle, useMemo, useState } from 'react';
|
|
2
2
|
import { useLocale } from "../../locale/useLocale";
|
|
3
|
+
import { handleExpandStyle } from "../assets/utils";
|
|
3
4
|
import './index.less';
|
|
4
5
|
const BaseTextComponent = forwardRef((props, ref) => {
|
|
5
6
|
const { translate } = useLocale();
|
|
@@ -8,11 +9,16 @@ const BaseTextComponent = forwardRef((props, ref) => {
|
|
|
8
9
|
useImperativeHandle(ref, () => ({
|
|
9
10
|
updateConfig: (newConfig) => setConfig(Object.assign({}, newConfig)),
|
|
10
11
|
}));
|
|
11
|
-
const strokeStyle = {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
const strokeStyle = useMemo(() => {
|
|
13
|
+
const { strokeWidth, strokeColor } = style || {};
|
|
14
|
+
return {
|
|
15
|
+
WebkitTextStrokeWidth: strokeWidth,
|
|
16
|
+
WebkitTextStrokeColor: strokeColor,
|
|
17
|
+
};
|
|
18
|
+
}, [style]);
|
|
19
|
+
// 扩展样式处理
|
|
20
|
+
const expandStyle = useMemo(() => handleExpandStyle(style === null || style === void 0 ? void 0 : style.expandStyle), [style]);
|
|
21
|
+
return (React.createElement("div", { className: 'base-text-component', style: Object.assign(Object.assign(Object.assign({}, style), strokeStyle), expandStyle) }, (data === null || data === void 0 ? void 0 : data.staticData) ? translate("${" + data.staticData + "}") : ""));
|
|
16
22
|
});
|
|
17
23
|
export default BaseTextComponent;
|
|
18
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/base-text/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/base-text/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAA+B,UAAU,EAAE,mBAAmB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC/G,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,cAAc,CAAC;AA0BtB,MAAM,iBAAiB,GAAG,UAAU,CAAC,CAAC,KAA6B,EAAE,GAAuC,EAAE,EAAE;IAC5G,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAClC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,mBAA8B,KAAK,EAAG,CAAC;IAC3E,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAE/B,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5B,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,mBAAM,SAAS,EAAG;KAC3D,CAAC,CAAC,CAAC;IAEJ,MAAM,WAAW,GAAkB,OAAO,CAAC,GAAG,EAAE;QAC5C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO;YACH,qBAAqB,EAAE,WAAW;YAClC,qBAAqB,EAAE,WAAW;SACrC,CAAA;IACL,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,SAAS;IACT,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAElF,OAAO,CACH,6BACI,SAAS,EAAE,qBAAqB,EAChC,KAAK,gDAAO,KAAK,GAAK,WAAW,GAAK,WAAW,KAEhD,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAC,CAAC,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAC9D,CACT,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
.base-text-component {
|
|
3
|
-
--stroke-color: #000000;
|
|
4
|
-
--stroke-width: 0;
|
|
5
|
-
|
|
6
|
-
height: 100%;
|
|
7
|
-
display: flex;
|
|
8
|
-
-webkit-text-stroke-color: var(--stroke-color);
|
|
9
|
-
-webkit-text-stroke-width: var(--stroke-width);
|
|
10
|
-
stroke-color: var(--stroke-color);
|
|
11
|
-
stroke-width: var(--stroke-width);
|
|
12
|
-
|
|
13
|
-
input {
|
|
14
|
-
outline: none;
|
|
15
|
-
width: 100%;
|
|
16
|
-
background-color: rgba(255, 222, 173, 0);
|
|
17
|
-
text-align: center;
|
|
18
|
-
border: none;
|
|
19
|
-
}
|
|
1
|
+
|
|
2
|
+
.base-text-component {
|
|
3
|
+
--stroke-color: #000000;
|
|
4
|
+
--stroke-width: 0;
|
|
5
|
+
|
|
6
|
+
height: 100%;
|
|
7
|
+
display: flex;
|
|
8
|
+
-webkit-text-stroke-color: var(--stroke-color);
|
|
9
|
+
-webkit-text-stroke-width: var(--stroke-width);
|
|
10
|
+
stroke-color: var(--stroke-color);
|
|
11
|
+
stroke-width: var(--stroke-width);
|
|
12
|
+
|
|
13
|
+
input {
|
|
14
|
+
outline: none;
|
|
15
|
+
width: 100%;
|
|
16
|
+
background-color: rgba(255, 222, 173, 0);
|
|
17
|
+
text-align: center;
|
|
18
|
+
border: none;
|
|
19
|
+
}
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-container.d.ts","sourceRoot":"","sources":["../../../../../../src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"component-container.d.ts","sourceRoot":"","sources":["../../../../../../src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2E,MAAM,OAAO,CAAC;AAEhG,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AA6DhE,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,oBAAoB,CAAC;CACtC;AAED,QAAA,MAAM,kBAAkB,oCAAgB,uBAAuB,uBAyE7D,CAAC;AAGH,eAAe,kBAAkB,CAAC"}
|
|
@@ -1,8 +1,54 @@
|
|
|
1
|
-
import React, { memo, Suspense, useEffect, useRef, useState, useContext } from "react";
|
|
1
|
+
import React, { memo, Suspense, useEffect, useRef, useState, useContext, useMemo } from "react";
|
|
2
2
|
import Loading from "./loading";
|
|
3
3
|
import abstractDesignerLoader from "./abstract-designer-loader";
|
|
4
4
|
import { useNavigate } from "react-router-dom";
|
|
5
5
|
import { ControllerContext } from "../index";
|
|
6
|
+
/** 静态 style,避免每次 render 重新创建对象 */
|
|
7
|
+
const BASE_OUTER_STYLE = {
|
|
8
|
+
position: 'absolute',
|
|
9
|
+
transformOrigin: 'center',
|
|
10
|
+
};
|
|
11
|
+
const BASE_INNER_STYLE = {
|
|
12
|
+
width: '100%',
|
|
13
|
+
height: '100%',
|
|
14
|
+
transformOrigin: 'center',
|
|
15
|
+
position: 'relative',
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* 根据 layer 数据统一计算外层 2D transform 与内层 3D transform。
|
|
19
|
+
* 外层只承载 translate/2D-rotate(供 moveable 操作),内层承载 rotateX/Y/Z。
|
|
20
|
+
* 职责分离,避免 moveable 将 3D 值写入 layer.transform 导致重复叠加。
|
|
21
|
+
*/
|
|
22
|
+
const resolveTransforms = (layer) => {
|
|
23
|
+
const { rotateX, rotateY, rotateZ, perspective } = layer.transform3D || {};
|
|
24
|
+
const has3D = !!(rotateX || rotateY || rotateZ); // 是否存在3D转换
|
|
25
|
+
const baseTransform = layer.transform || `translate(${layer.x}px, ${layer.y}px)`;
|
|
26
|
+
// --- 外层 2D transform ---
|
|
27
|
+
let outerTransform;
|
|
28
|
+
if (has3D) {
|
|
29
|
+
// 仅提取 translate + 2D rotate,剥离可能混入的 3D 部分
|
|
30
|
+
const translateMatch = baseTransform.match(/translate\([^)]+\)/);
|
|
31
|
+
const translate = translateMatch ? translateMatch[0] : `translate(${layer.x}px, ${layer.y}px)`;
|
|
32
|
+
const rotateMatch = baseTransform.match(/\brotate\([^)]+\)/);
|
|
33
|
+
outerTransform = rotateMatch ? `${translate} ${rotateMatch[0]}` : translate;
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
outerTransform = baseTransform;
|
|
37
|
+
}
|
|
38
|
+
// --- 内层 3D transform ---
|
|
39
|
+
let innerTransform;
|
|
40
|
+
if (has3D) {
|
|
41
|
+
const parts = [];
|
|
42
|
+
if (rotateX)
|
|
43
|
+
parts.push(`rotateX(${rotateX}deg)`);
|
|
44
|
+
if (rotateY)
|
|
45
|
+
parts.push(`rotateY(${rotateY}deg)`);
|
|
46
|
+
if (rotateZ)
|
|
47
|
+
parts.push(`rotateZ(${rotateZ}deg)`);
|
|
48
|
+
innerTransform = parts.join(' ');
|
|
49
|
+
}
|
|
50
|
+
return { outerTransform, innerTransform, has3D, perspective };
|
|
51
|
+
};
|
|
6
52
|
const registerProxy = (compId, controller) => {
|
|
7
53
|
controller.changeData = new Proxy(controller.changeData, {
|
|
8
54
|
apply(target, thisArg, argus) {
|
|
@@ -52,21 +98,10 @@ const ComponentContainer = memo((props) => {
|
|
|
52
98
|
setControllers(val => (Object.assign(Object.assign({}, val), { [layer.id]: null })));
|
|
53
99
|
};
|
|
54
100
|
}, []);
|
|
101
|
+
const { outerTransform, innerTransform, has3D, perspective } = useMemo(() => resolveTransforms(layer), [layer.transform, layer.x, layer.y, layer.transform3D]);
|
|
55
102
|
return (React.createElement(Suspense, { fallback: React.createElement(Loading, null) },
|
|
56
|
-
React.createElement("div", { id: layer.id, "data-type": layer.type, "data-lock": layer.lock, "data-hide": layer.hide, key: layer.id + '', style: {
|
|
57
|
-
|
|
58
|
-
height: layer.height,
|
|
59
|
-
transform: layer.transform || `translate(${layer.x}px, ${layer.y}px)`,
|
|
60
|
-
position: 'absolute',
|
|
61
|
-
visibility: layer.hide ? "hidden" : "visible",
|
|
62
|
-
border: 'none'
|
|
63
|
-
}, className: "lc-comp-item" },
|
|
64
|
-
React.createElement("div", { ref: ref, style: {
|
|
65
|
-
width: '100%',
|
|
66
|
-
height: '100%',
|
|
67
|
-
pointerEvents: 'auto',
|
|
68
|
-
position: 'relative'
|
|
69
|
-
} }))));
|
|
103
|
+
React.createElement("div", { id: layer.id, "data-type": layer.type, "data-lock": layer.lock, "data-hide": layer.hide, key: layer.id + '', style: Object.assign(Object.assign({}, BASE_OUTER_STYLE), { width: layer.width, height: layer.height, transform: outerTransform, perspective: (has3D && perspective) ? `${perspective}px` : undefined, transformStyle: has3D ? 'preserve-3d' : undefined, visibility: layer.hide ? 'hidden' : 'visible', border: 'none' }), className: "lc-comp-item" },
|
|
104
|
+
React.createElement("div", { ref: ref, style: Object.assign(Object.assign({}, BASE_INNER_STYLE), { transform: innerTransform, pointerEvents: 'auto' }) }))));
|
|
70
105
|
});
|
|
71
106
|
export default ComponentContainer;
|
|
72
107
|
//# sourceMappingURL=component-container.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-container.js","sourceRoot":"","sources":["../../../../../../src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"component-container.js","sourceRoot":"","sources":["../../../../../../src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,12 @@ export interface ILayerItem {
|
|
|
16
16
|
prev?: string;
|
|
17
17
|
next?: string;
|
|
18
18
|
transform?: string;
|
|
19
|
+
transform3D?: {
|
|
20
|
+
rotateX?: number;
|
|
21
|
+
rotateY?: number;
|
|
22
|
+
rotateZ?: number;
|
|
23
|
+
perspective?: number;
|
|
24
|
+
};
|
|
19
25
|
}
|
|
20
26
|
export interface LayerManagerDataType {
|
|
21
27
|
elemConfigs?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IAEvB,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAExB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;IAExB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/interface.ts"],"names":[],"mappings":"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"}
|
package/lib/table/act-table.d.ts
CHANGED
|
@@ -91,6 +91,7 @@ interface ActTableStat {
|
|
|
91
91
|
pageSizeOptions?: number[];
|
|
92
92
|
customDrawerSize?: number | string;
|
|
93
93
|
tableNumber?: number;
|
|
94
|
+
isQuery?: boolean;
|
|
94
95
|
}
|
|
95
96
|
declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
96
97
|
state: {
|
|
@@ -130,6 +131,7 @@ declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat>
|
|
|
130
131
|
customDrawerSize: any;
|
|
131
132
|
tableNumber: number;
|
|
132
133
|
showTableAdd: any;
|
|
134
|
+
isQuery: boolean;
|
|
133
135
|
};
|
|
134
136
|
static contextType: React.Context<{
|
|
135
137
|
locale: import("../locale/langMp").LocaleType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}
|