@next-core/runtime 1.54.8 → 1.54.9
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/dist/cjs/setWatermark.js
CHANGED
|
@@ -22,8 +22,14 @@ function setWatermark() {
|
|
|
22
22
|
const watermarkConfig = settings.watermarkConfig ?? {
|
|
23
23
|
flags: {}
|
|
24
24
|
};
|
|
25
|
+
const content = [...(typeof watermarkConfig.content === "string" ? [watermarkConfig.content] : watermarkConfig.content ?? []), (_watermarkConfig$flag = watermarkConfig.flags) !== null && _watermarkConfig$flag !== void 0 && _watermarkConfig$flag["show-development"] && isDeveloper ? "Development" : "", (_watermarkConfig$flag2 = watermarkConfig.flags) !== null && _watermarkConfig$flag2 !== void 0 && _watermarkConfig$flag2["show-user"] ? username : ""].filter(Boolean);
|
|
26
|
+
|
|
27
|
+
// Do not call showWatermark if there is no content
|
|
28
|
+
if (content.length === 0) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
25
31
|
const defaultProps = {
|
|
26
|
-
content
|
|
32
|
+
content,
|
|
27
33
|
zIndex: 1001,
|
|
28
34
|
width: 200,
|
|
29
35
|
font: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setWatermark.js","names":["_loader","require","_Runtime","_lodash","brick","WATEMARK_BRICKNAME","exports","setWatermark","_window$APP_ROOT","_window$APP_ROOT2","_hooks$auth","_watermarkConfig$flag","_watermarkConfig$flag2","flags","getRuntime","getFeatureFlags","settings","getMiscSettings","isDeveloper","window","APP_ROOT","match","username","hooks","auth","getAuth","watermarkConfig","
|
|
1
|
+
{"version":3,"file":"setWatermark.js","names":["_loader","require","_Runtime","_lodash","brick","WATEMARK_BRICKNAME","exports","setWatermark","_window$APP_ROOT","_window$APP_ROOT2","_hooks$auth","_watermarkConfig$flag","_watermarkConfig$flag2","flags","getRuntime","getFeatureFlags","settings","getMiscSettings","isDeveloper","window","APP_ROOT","match","username","hooks","auth","getAuth","watermarkConfig","content","filter","Boolean","length","defaultProps","zIndex","width","font","fontSize","gap","omit","resolve","loadBricksImperatively","getBrickPackages","then","document","createElement","error","console"],"sources":["../../src/setWatermark.ts"],"sourcesContent":["import { loadBricksImperatively } from \"@next-core/loader\";\nimport { getBrickPackages, getRuntime, hooks } from \"./internal/Runtime.js\";\nimport { omit } from \"lodash\";\n\ninterface WaterMarkProps {\n container?: HTMLElement;\n content?: string | string[];\n zIndex?: number;\n rotate?: number;\n width?: number;\n height?: number;\n image?: string;\n font?: {\n color?: CanvasFillStrokeStyles[\"fillStyle\"];\n fontSize?: number | string;\n fontWeight?: \"normal\" | \"light\" | \"weight\" | number;\n fontStyle?: \"none\" | \"normal\" | \"italic\" | \"oblique\";\n fontFamily?: string;\n textAlign?: CanvasTextAlign;\n };\n style?: React.CSSProperties;\n gap?: [number, number];\n offset?: [number, number];\n}\n\nlet brick: {\n resolve(options: WaterMarkProps): void;\n};\n\nexport const WATEMARK_BRICKNAME = \"basic.show-watermark\";\n\nexport function setWatermark() {\n const flags = getRuntime().getFeatureFlags();\n const settings = getRuntime().getMiscSettings();\n if (!flags[\"show-watermark\"]) {\n return;\n }\n const isDeveloper =\n window.APP_ROOT?.match(/versions\\/([^/]+)\\//)?.[1] === \"0.0.0\" ||\n window.APP_ROOT?.match(/micro-apps\\/(?:v2|v3)\\/[^/]+\\/([^/]+)/)?.[1] ===\n \"0.0.0\";\n const username =\n (hooks?.auth?.getAuth() as Record<string, any>)?.username ?? \"\";\n const watermarkConfig = (settings.watermarkConfig ?? {\n flags: {},\n }) as WaterMarkProps & {\n flags: {\n \"show-development\"?: boolean;\n \"show-user\"?: boolean;\n };\n };\n\n const content = [\n ...(typeof watermarkConfig.content === \"string\"\n ? [watermarkConfig.content]\n : watermarkConfig.content ?? []),\n watermarkConfig.flags?.[\"show-development\"] && isDeveloper\n ? \"Development\"\n : \"\",\n watermarkConfig.flags?.[\"show-user\"] ? username : \"\",\n ].filter(Boolean);\n\n // Do not call showWatermark if there is no content\n if (content.length === 0) {\n return;\n }\n\n const defaultProps: WaterMarkProps = {\n content,\n zIndex: 1001,\n width: 200,\n font: {\n fontSize: 28,\n },\n gap: [190, 190],\n ...omit(watermarkConfig, [\"content\", \"flags\"]),\n };\n if (brick) {\n brick.resolve(defaultProps);\n } else {\n loadBricksImperatively([WATEMARK_BRICKNAME], getBrickPackages()).then(\n () => {\n brick = document.createElement(WATEMARK_BRICKNAME) as any;\n\n brick.resolve(defaultProps);\n },\n // istanbul ignore next\n (error: unknown) => {\n // eslint-disable-next-line no-console\n console.error(\"Load watermark service failed:\", error);\n }\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
package/dist/esm/setWatermark.js
CHANGED
|
@@ -15,8 +15,14 @@ export function setWatermark() {
|
|
|
15
15
|
const watermarkConfig = settings.watermarkConfig ?? {
|
|
16
16
|
flags: {}
|
|
17
17
|
};
|
|
18
|
+
const content = [...(typeof watermarkConfig.content === "string" ? [watermarkConfig.content] : watermarkConfig.content ?? []), (_watermarkConfig$flag = watermarkConfig.flags) !== null && _watermarkConfig$flag !== void 0 && _watermarkConfig$flag["show-development"] && isDeveloper ? "Development" : "", (_watermarkConfig$flag2 = watermarkConfig.flags) !== null && _watermarkConfig$flag2 !== void 0 && _watermarkConfig$flag2["show-user"] ? username : ""].filter(Boolean);
|
|
19
|
+
|
|
20
|
+
// Do not call showWatermark if there is no content
|
|
21
|
+
if (content.length === 0) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
18
24
|
const defaultProps = {
|
|
19
|
-
content
|
|
25
|
+
content,
|
|
20
26
|
zIndex: 1001,
|
|
21
27
|
width: 200,
|
|
22
28
|
font: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setWatermark.js","names":["loadBricksImperatively","getBrickPackages","getRuntime","hooks","omit","brick","WATEMARK_BRICKNAME","setWatermark","_window$APP_ROOT","_window$APP_ROOT2","_hooks$auth","_watermarkConfig$flag","_watermarkConfig$flag2","flags","getFeatureFlags","settings","getMiscSettings","isDeveloper","window","APP_ROOT","match","username","auth","getAuth","watermarkConfig","
|
|
1
|
+
{"version":3,"file":"setWatermark.js","names":["loadBricksImperatively","getBrickPackages","getRuntime","hooks","omit","brick","WATEMARK_BRICKNAME","setWatermark","_window$APP_ROOT","_window$APP_ROOT2","_hooks$auth","_watermarkConfig$flag","_watermarkConfig$flag2","flags","getFeatureFlags","settings","getMiscSettings","isDeveloper","window","APP_ROOT","match","username","auth","getAuth","watermarkConfig","content","filter","Boolean","length","defaultProps","zIndex","width","font","fontSize","gap","resolve","then","document","createElement","error","console"],"sources":["../../src/setWatermark.ts"],"sourcesContent":["import { loadBricksImperatively } from \"@next-core/loader\";\nimport { getBrickPackages, getRuntime, hooks } from \"./internal/Runtime.js\";\nimport { omit } from \"lodash\";\n\ninterface WaterMarkProps {\n container?: HTMLElement;\n content?: string | string[];\n zIndex?: number;\n rotate?: number;\n width?: number;\n height?: number;\n image?: string;\n font?: {\n color?: CanvasFillStrokeStyles[\"fillStyle\"];\n fontSize?: number | string;\n fontWeight?: \"normal\" | \"light\" | \"weight\" | number;\n fontStyle?: \"none\" | \"normal\" | \"italic\" | \"oblique\";\n fontFamily?: string;\n textAlign?: CanvasTextAlign;\n };\n style?: React.CSSProperties;\n gap?: [number, number];\n offset?: [number, number];\n}\n\nlet brick: {\n resolve(options: WaterMarkProps): void;\n};\n\nexport const WATEMARK_BRICKNAME = \"basic.show-watermark\";\n\nexport function setWatermark() {\n const flags = getRuntime().getFeatureFlags();\n const settings = getRuntime().getMiscSettings();\n if (!flags[\"show-watermark\"]) {\n return;\n }\n const isDeveloper =\n window.APP_ROOT?.match(/versions\\/([^/]+)\\//)?.[1] === \"0.0.0\" ||\n window.APP_ROOT?.match(/micro-apps\\/(?:v2|v3)\\/[^/]+\\/([^/]+)/)?.[1] ===\n \"0.0.0\";\n const username =\n (hooks?.auth?.getAuth() as Record<string, any>)?.username ?? \"\";\n const watermarkConfig = (settings.watermarkConfig ?? {\n flags: {},\n }) as WaterMarkProps & {\n flags: {\n \"show-development\"?: boolean;\n \"show-user\"?: boolean;\n };\n };\n\n const content = [\n ...(typeof watermarkConfig.content === \"string\"\n ? [watermarkConfig.content]\n : watermarkConfig.content ?? []),\n watermarkConfig.flags?.[\"show-development\"] && isDeveloper\n ? \"Development\"\n : \"\",\n watermarkConfig.flags?.[\"show-user\"] ? username : \"\",\n ].filter(Boolean);\n\n // Do not call showWatermark if there is no content\n if (content.length === 0) {\n return;\n }\n\n const defaultProps: WaterMarkProps = {\n content,\n zIndex: 1001,\n width: 200,\n font: {\n fontSize: 28,\n },\n gap: [190, 190],\n ...omit(watermarkConfig, [\"content\", \"flags\"]),\n };\n if (brick) {\n brick.resolve(defaultProps);\n } else {\n loadBricksImperatively([WATEMARK_BRICKNAME], getBrickPackages()).then(\n () => {\n brick = document.createElement(WATEMARK_BRICKNAME) as any;\n\n brick.resolve(defaultProps);\n },\n // istanbul ignore next\n (error: unknown) => {\n // eslint-disable-next-line no-console\n console.error(\"Load watermark service failed:\", error);\n }\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@next-core/runtime",
|
|
3
|
-
"version": "1.54.
|
|
3
|
+
"version": "1.54.9",
|
|
4
4
|
"homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/runtime",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"repository": {
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"@next-core/build-next-libs": "^1.0.18",
|
|
68
68
|
"@next-core/test-next": "^1.1.5"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "f75b80be2de2695ed94822e5948c72cd84ecaad2"
|
|
71
71
|
}
|