aldehyde 0.2.348 → 0.2.350

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.
Files changed (11) hide show
  1. package/lib/login3/index.less +2 -3
  2. package/lib/lowcode-components/base-button/index.js +1 -1
  3. package/lib/lowcode-components/base-button/index.js.map +1 -1
  4. package/lib/lowcode-components/lowcode-view/index.d.ts +2 -0
  5. package/lib/lowcode-components/lowcode-view/index.d.ts.map +1 -1
  6. package/lib/lowcode-components/lowcode-view/index.js +11 -3
  7. package/lib/lowcode-components/lowcode-view/index.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/aldehyde/login3/index.less +2 -3
  10. package/src/aldehyde/lowcode-components/base-button/index.tsx +1 -1
  11. package/src/aldehyde/lowcode-components/lowcode-view/index.tsx +15 -4
package/lib/login3/index.less CHANGED
@@ -39,8 +39,7 @@
39
39
  }
40
40
 
41
41
  .head-logo {
42
- width: 38px;
43
- height: 38px;
42
+ width: 48px;
44
43
  margin-right: 16px;
45
44
  }
46
45
  }
@@ -70,7 +69,7 @@
70
69
  .login-logo-text,
71
70
  .login-logo-text-sub {
72
71
  font-size: 28px;
73
- padding: 12px 0 20px;
72
+ padding: 12px 0;
74
73
  font-family: YouSheBiaoTiHei;
75
74
  text-align: justify;
76
75
  font-style: normal;
package/lib/lowcode-components/base-button/index.js CHANGED
@@ -77,7 +77,7 @@ const ButtonComponent = forwardRef((props, ref) => {
77
77
  const match = hash.match(pattern);
78
78
  const sourceId = match === null || match === void 0 ? void 0 : match[1];
79
79
  const menuId = match === null || match === void 0 ? void 0 : match[2];
80
- const isLayout = ["#/v2/", "#/v3/"].some(prefix => hash.startsWith(prefix));
80
+ const isLayout = ["#/v2/", "#/v3/", "#/v4/", "#/v5/"].some(prefix => hash.startsWith(prefix));
81
81
  if (sourceId && menuId) {
82
82
  const url = `${isLayout ? `/${version}` : ""}/ddpage/${sourceId}/${ddpageId}?menuId=${menuId}`;
83
83
  target === "self" ? navigate(url) : window.open(`#${url}`, "_blank");
package/lib/lowcode-components/base-button/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/base-button/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/base-button/index.tsx"],"names":[],"mappings":"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"}
package/lib/lowcode-components/lowcode-view/index.d.ts CHANGED
@@ -4,6 +4,8 @@ import "./index.less";
4
4
  export declare const ControllerContext: React.Context<any>;
5
5
  interface Props {
6
6
  isFullScreen: boolean;
7
+ ddpageId?: string;
8
+ layoutRootPath?: string;
7
9
  }
8
10
  declare const LowcodeView: (props: Props) => React.JSX.Element;
9
11
  export default LowcodeView;
package/lib/lowcode-components/lowcode-view/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAMhF,OAAO,iCAAiC,CAAC;AAMzC,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,iBAAiB,oBAAsB,CAAC;AAoBrD,UAAU,KAAK;IACX,YAAY,EAAE,OAAO,CAAA;CACxB;AAED,QAAA,MAAM,WAAW,GAAI,OAAO,KAAK,sBAuIhC,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAMhF,OAAO,iCAAiC,CAAC;AAMzC,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,iBAAiB,oBAAsB,CAAC;AA4BrD,UAAU,KAAK;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,QAAA,MAAM,WAAW,GAAI,OAAO,KAAK,sBAwIhC,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/lib/lowcode-components/lowcode-view/index.js CHANGED
@@ -46,9 +46,17 @@ const screenFitStyleMap = {
46
46
  'full-x': { overflow: 'hidden scroll' },
47
47
  'full-y': { overflow: 'scroll hidden' }
48
48
  };
49
+ // 非全屏-不同风格的页面高度
50
+ const viewHeight = {
51
+ v2: "calc(100vh - 121px)",
52
+ v3: "calc(100vh - 230px)",
53
+ v4: "calc(100vh - 153px)",
54
+ v5: "calc(100vh - 88px)"
55
+ };
49
56
  const LowcodeView = (props) => {
50
- const { isFullScreen } = props;
51
- const { ddpageId } = useParams();
57
+ const { isFullScreen, layoutRootPath, ddpageId: propsDdpageId } = props;
58
+ const { ddpageId: urlDdpageId } = useParams();
59
+ const ddpageId = propsDdpageId || urlDdpageId;
52
60
  const [loading, setLoading] = useState(false);
53
61
  const [layerManager, setLayerManager] = useState();
54
62
  const [canvasConfig, setCanvasConfig] = useState();
@@ -155,7 +163,7 @@ const LowcodeView = (props) => {
155
163
  position: "relative"
156
164
  } }, layerBuilder.buildCanvasComponents(layerManager));
157
165
  return (React.createElement(ControllerContext.Provider, { value: { setControllers, setSearchParams } },
158
- React.createElement("div", { className: 'lowcodeView', style: Object.assign({ height: isFullScreen ? "100vh" : "calc(100vh - 121px)" }, screenFitStyleMap[adaptationType || "scale"]) }, loading || !layerManager ?
166
+ React.createElement("div", { className: 'lowcodeView', style: Object.assign({ height: isFullScreen ? "100vh" : viewHeight[layoutRootPath || "v2"] }, screenFitStyleMap[adaptationType || "scale"]) }, loading || !layerManager ?
159
167
  React.createElement(Loading, null)
160
168
  :
161
169
  (adaptationType === 'none' ? canvasDom() :
package/lib/lowcode-components/lowcode-view/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/lowcode-components/lowcode-view/index.tsx"],"names":[],"mappings":"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"}
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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aldehyde",
3
- "version": "0.2.348",
3
+ "version": "0.2.350",
4
4
  "author": "cosmicparticle",
5
5
  "main": "lib/index.js",
6
6
  "module": "src/aldehyde/index.txs",
package/src/aldehyde/login3/index.less CHANGED
@@ -39,8 +39,7 @@
39
39
  }
40
40
 
41
41
  .head-logo {
42
- width: 38px;
43
- height: 38px;
42
+ width: 48px;
44
43
  margin-right: 16px;
45
44
  }
46
45
  }
@@ -70,7 +69,7 @@
70
69
  .login-logo-text,
71
70
  .login-logo-text-sub {
72
71
  font-size: 28px;
73
- padding: 12px 0 20px;
72
+ padding: 12px 0;
74
73
  font-family: YouSheBiaoTiHei;
75
74
  text-align: justify;
76
75
  font-style: normal;
package/src/aldehyde/lowcode-components/base-button/index.tsx CHANGED
@@ -116,7 +116,7 @@ const ButtonComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<Com
116
116
  const match = hash.match(pattern);
117
117
  const sourceId = match?.[1];
118
118
  const menuId = match?.[2];
119
- const isLayout = ["#/v2/", "#/v3/"].some(prefix => hash.startsWith(prefix));
119
+ const isLayout = ["#/v2/", "#/v3/", "#/v4/", "#/v5/"].some(prefix => hash.startsWith(prefix));
120
120
  if (sourceId && menuId) {
121
121
  const url = `${isLayout ? `/${version}` : ""}/ddpage/${sourceId}/${ddpageId}?menuId=${menuId}`;
122
122
  target === "self" ? navigate(url) : window.open(`#${url}`, "_blank");
package/src/aldehyde/lowcode-components/lowcode-view/index.tsx CHANGED
@@ -32,13 +32,24 @@ const screenFitStyleMap: Record<string, CSSProperties> = {
32
32
  'full-y': { overflow: 'scroll hidden' }
33
33
  }
34
34
 
35
+ // 非全屏-不同风格的页面高度
36
+ const viewHeight = {
37
+ v2: "calc(100vh - 121px)",
38
+ v3: "calc(100vh - 230px)",
39
+ v4: "calc(100vh - 153px)",
40
+ v5: "calc(100vh - 88px)"
41
+ }
42
+
35
43
  interface Props {
36
- isFullScreen: boolean
44
+ isFullScreen: boolean,
45
+ ddpageId?: string,
46
+ layoutRootPath?: string,
37
47
  }
38
48
 
39
49
  const LowcodeView = (props: Props) => {
40
- const { isFullScreen } = props;
41
- const { ddpageId } = useParams();
50
+ const { isFullScreen, layoutRootPath, ddpageId: propsDdpageId } = props;
51
+ const { ddpageId: urlDdpageId } = useParams();
52
+ const ddpageId = propsDdpageId || urlDdpageId;
42
53
  const [loading, setLoading] = useState<boolean>(false);
43
54
  const [layerManager, setLayerManager] = useState<LayerManagerDataType>();
44
55
  const [canvasConfig, setCanvasConfig] = useState<CanvasConfig>();
@@ -155,7 +166,7 @@ const LowcodeView = (props: Props) => {
155
166
 
156
167
  return (
157
168
  <ControllerContext.Provider value={{ setControllers, setSearchParams }}>
158
- <div className='lowcodeView' style={{ height: isFullScreen ? "100vh" : "calc(100vh - 121px)", ...screenFitStyleMap[adaptationType || "scale"] }}>
169
+ <div className='lowcodeView' style={{ height: isFullScreen ? "100vh" : viewHeight[layoutRootPath || "v2"], ...screenFitStyleMap[adaptationType || "scale"] }}>
159
170
  {loading || !layerManager ?
160
171
  <Loading />
161
172
  :