@shjjs/visual-ui 1.0.25 → 1.0.26

package/es/commons/plugins/event/actions/pageAction.mjs

@@ -1,14 +1,25 @@
-import { DataSourceUtils as o } from "../../datasource/utils/utils.mjs";
-import { EventUtils as l } from "../utils/utils.mjs";
-const u = (n, p) => {
-  const { pageAction: t } = n;
-  if (!t.target)
+import { DataSourceUtils as l } from "../../datasource/utils/utils.mjs";
+import { EventUtils as p } from "../utils/utils.mjs";
+const S = (g, w) => {
+  const { pageAction: e } = g, d = l.getVariableData(), s = l.replaceStringVariables(e.parameter, d), r = s ? p.urlParamToJson(s) : null;
+  let a = e.target;
+  if (!a && e.pageId && (window.location.href.includes("/sharing") && (window.location.href.includes("/#") ? a = `/#/proto/${e.pageId}/sharing` : a = `/proto/${e.pageId}/sharing`), window.location.href.includes("/release") && (window.location.href.includes("/#") ? a = `/#/release/${e.pageId}` : a = `/release/${e.pageId}`)), !a)
     return;
-  const i = o.getVariableData(), a = o.replaceStringVariables(t.parameter, i), r = a ? l.urlParamToJson(a) : null, e = new URL(t.target, window.location.origin);
-  r && Object.entries(r).forEach(([c, s]) => {
-    e.searchParams.append(c, s);
-  }), window.location.href = e.toString();
+  const t = new URL(a, window.location.origin);
+  if (r) {
+    const n = t.toString().indexOf("/#/");
+    if (n !== -1) {
+      const o = t.toString().substring(0, n), i = t.toString().substring(n), c = new URLSearchParams();
+      Object.entries(r).forEach(([f, h]) => {
+        c.append(f, h);
+      }), window.location.href = `${o}${i}?${c.toString()}`;
+    } else
+      Object.entries(r).forEach(([o, i]) => {
+        t.searchParams.append(o, i);
+      }), window.location.href = t.toString();
+  } else
+    window.location.href = t.toString();
 };
 export {
-  u as executePageAction
+  S as executePageAction
 };

package/lib/commons/plugins/event/actions/pageAction.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../datasource/utils/utils.js"),l=require("../utils/utils.js"),u=(i,g)=>{const{pageAction:e}=i;if(!e.target)return;const n=o.DataSourceUtils.getVariableData(),t=o.DataSourceUtils.replaceStringVariables(e.parameter,n),a=t?l.EventUtils.urlParamToJson(t):null,r=new URL(e.target,window.location.origin);a&&Object.entries(a).forEach(([c,s])=>{r.searchParams.append(c,s)}),window.location.href=r.toString()};exports.executePageAction=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../datasource/utils/utils.js"),f=require("../utils/utils.js"),p=(g,w)=>{const{pageAction:e}=g,d=l.DataSourceUtils.getVariableData(),s=l.DataSourceUtils.replaceStringVariables(e.parameter,d),n=s?f.EventUtils.urlParamToJson(s):null;let t=e.target;if(!t&&e.pageId&&(window.location.href.includes("/sharing")&&(window.location.href.includes("/#")?t=`/#/proto/${e.pageId}/sharing`:t=`/proto/${e.pageId}/sharing`),window.location.href.includes("/release")&&(window.location.href.includes("/#")?t=`/#/release/${e.pageId}`:t=`/release/${e.pageId}`)),!t)return;const a=new URL(t,window.location.origin);if(n){const r=a.toString().indexOf("/#/");if(r!==-1){const i=a.toString().substring(0,r),o=a.toString().substring(r),c=new URLSearchParams;Object.entries(n).forEach(([u,h])=>{c.append(u,h)}),window.location.href=`${i}${o}?${c.toString()}`}else Object.entries(n).forEach(([i,o])=>{a.searchParams.append(i,o)}),window.location.href=a.toString()}else window.location.href=a.toString()};exports.executePageAction=p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shjjs/visual-ui",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "国产自研零代码可视化源码工具",
   "keywords": [
     "three",