@das-fed/web 7.0.7-hot.60 → 7.0.7-hot.61

package/{packages/main-app-framework/index-DLlWagE3.js → index-CDxDqvvD.js}

@@ -1,19 +1,19 @@
-import { defineComponent as C, computed as p, createElementBlock as S, openBlock as A, Fragment as I, createElementVNode as j, withDirectives as D, createVNode as d, unref as c, withCtx as E, vShow as P } from "vue";
-import { layoutData as $ } from "@das-fed/web/packages/layout/index";
-import { t as b } from "@das-fed/web/packages/i18n/index";
+import { defineComponent as C, computed as p, createElementBlock as S, openBlock as A, Fragment as I, createElementVNode as j, withDirectives as b, createVNode as d, unref as c, withCtx as D, vShow as E } from "vue";
+import { layoutData as P } from "@das-fed/web/packages/layout/index";
+import { t as $ } from "@das-fed/web/packages/i18n/index";
 import { DasAppContainer as x } from "@das-fed/ui/packages/business-components/app-container/index";
 import { DasSpin as T } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as L } from "@das-fed/utils/common-info";
 import { setShowLayout as q } from "@das-fed/utils/common-tools";
 import { createService as B } from "@das-fed/utils/create-api-service";
-import { u as N, p as R, a as l, c as m, b as V, l as F, g as K, d as M } from "./index-DvSOhjci.js";
+import { u as N, p as R, a as l, c as m, b as V, l as F, g as K, d as M } from "./index-q8r7G4BJ.js";
 const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/auth/user/auth_code"), ne = /* @__PURE__ */ C({
   __name: "index",
   setup(J) {
     const { beforeEntryApp: g, entryApp: h } = N(), w = () => {
       const e = sessionStorage.getItem("iwmStationReservePath") || "/";
-      window.__isAutoCloseApp = !1, location.href = e;
-    }, _ = p(() => R.value.skinStyle), y = p(() => !!$.menu.items.length), k = p(() => {
+      window.__isAutoCloseApp = !1, window.open(e, "_blank");
+    }, _ = p(() => R.value.skinStyle), y = p(() => !!P.menu.items.length), k = p(() => {
       if (!l.value || !l.value.length) return [];
       const e = m(l.value);
       return Array.isArray(e) ? e.length ? (e.forEach((r) => {
@@ -31,7 +31,7 @@ const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/
     }, U = async (e, r = !0) => {
       if (!e) return;
       if (!sessionStorage.getItem("projectInfo")) {
-        window.confirm(b("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
+        window.confirm($("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
         return;
       }
       const t = m(e);
@@ -73,11 +73,11 @@ const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/
       null,
       [
         j("button", { onClick: w }, "测试跳转到工位预定"),
-        D(d(c(T), {
+        b(d(c(T), {
           full: "",
           spinning: c(V)
         }, {
-          default: E(() => [
+          default: D(() => [
             d(c(x), {
               theme: _.value,
               appCategorys: k.value,
@@ -87,7 +87,7 @@ const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/
           _: 1
           /* STABLE */
         }, 8, ["spinning"]), [
-          [P, !y.value]
+          [E, !y.value]
         ])
       ],
       64

package/{packages/main-app-framework/index-qekI7fBd.js → index-CZNzqhos.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as r } from "vue";
-import { _ as c } from "./index-DvSOhjci.js";
+import { _ as c } from "./index-q8r7G4BJ.js";
 const o = {};
 function t(n, _) {
   return r(), e("div");

package/{index-8eYS921_.js → index-q8r7G4BJ.js}

@@ -8175,9 +8175,8 @@ const Sd = async () => {
     isProjectSwitchReload: u
   };
 }, Dm = () => {
-  var u;
-  const n = new URL(window.location.href), e = n.pathname.replace(/\/+$/, "").toLowerCase().endsWith(Cd.toLowerCase()), r = ((u = n.searchParams.get("cityCode")) == null ? void 0 : u.trim()) ?? "";
-  e && r && sessionStorage.setItem(pv, "true");
+  const n = new URL(window.location.href);
+  n.pathname.replace(/\/+$/, "").toLowerCase().endsWith(Cd.toLowerCase()) && (n.searchParams.delete("cityCode"), n.searchParams.delete("reservationTime"), sessionStorage.removeItem(pv), window.history.replaceState(window.history.state, "", `${n.pathname}${n.search}${n.hash}`));
 }, jm = (n) => {
   sessionStorage.setItem(
     Fd,
@@ -14250,7 +14249,7 @@ const dV = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xml
       const r = e.tenant.id, u = (v == null ? void 0 : v.tenant) ?? "";
       r !== u && await n(u);
     }
-    ad(v || { id: 0 }), $6((v == null ? void 0 : v.id) || 0), (e == null ? void 0 : e.flag) !== 4 && (window.__isAutoCloseApp = !1, Dm(), window.location.reload());
+    ad(v || { id: 0 }), $6((v == null ? void 0 : v.id) || 0), (e == null ? void 0 : e.flag) !== 4 && (Dm(), window.__isAutoCloseApp = !1, window.location.reload());
   });
 }, bx = ve.get("/menu/search"), cx = ve.get("/searchhistory"), ax = ve.post("/searchhistory"), ix = ve.delete("/searchhistory"), qx = ve.delete("/searchhistory/deleteone"), sx = () => {
   const n = async () => {
@@ -18226,7 +18225,7 @@ g("@das-fed/web");
 const gN = [
   {
     path: ef,
-    component: () => import("./index-srSiACfB.js"),
+    component: () => import("./index-CDxDqvvD.js"),
     meta: {
       layout: {
         minWidth: "0px"
@@ -18235,7 +18234,7 @@ const gN = [
   },
   {
     path: cd,
-    component: () => import("./index-CYed9XU6.js")
+    component: () => import("./index-CZNzqhos.js")
   }
 ], iT = {
   routes: gN,

package/index.js

@@ -1,4 +1,4 @@
-import { J as e, A as t, C as n, B as i, D as r, e as u, m as o, w as m, o as p, f as g, k as D, v as l, y as L, z as b, h as c, i as h, G as A, H as T, q as y, E as R, F as W, K as I, I as M, s as F, j as V, n as f, r as k, x as v, t as w } from "./index-8eYS921_.js";
+import { J as e, A as t, C as n, B as i, D as r, e as u, m as o, w as m, o as p, f as g, k as D, v as l, y as L, z as b, h as c, i as h, G as A, H as T, q as y, E as R, F as W, K as I, I as M, s as F, j as V, n as f, r as k, x as v, t as w } from "./index-q8r7G4BJ.js";
 export {
   e as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "7.0.7-hot.60",
+  "version": "7.0.7-hot.61",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "7.0.7-hot.60",
-    "@das-fed/utils": "7.0.7-hot.60",
-    "@das-fed/web": "7.0.7-hot.60",
-    "@das-fed/web-components": "7.0.7-hot.60",
+    "@das-fed/ui": "7.0.7-hot.61",
+    "@das-fed/utils": "7.0.7-hot.61",
+    "@das-fed/web": "7.0.7-hot.61",
+    "@das-fed/web-components": "7.0.7-hot.61",
     "@microsoft/signalr": "^8.0.7",
     "@vueuse/core": "^9.13.0",
     "animate.css": "^4.1.1",
@@ -19,7 +19,7 @@
     "vue-router": "^4.4.0"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.0.7-hot.60",
+    "@das-fed/cli": "7.0.7-hot.61",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

package/packages/main-app-framework/{index-DvSOhjci.js → index-CszZ6ZSo.js}

@@ -6711,9 +6711,8 @@ const rp = async () => {
     isProjectSwitchReload: l
   };
 }, R4 = () => {
-  var l;
-  const o = new URL(window.location.href), n = o.pathname.replace(/\/+$/, "").toLowerCase().endsWith(sp.toLowerCase()), a = ((l = o.searchParams.get("cityCode")) == null ? void 0 : l.trim()) ?? "";
-  n && a && sessionStorage.setItem(ji, "true");
+  const o = new URL(window.location.href);
+  o.pathname.replace(/\/+$/, "").toLowerCase().endsWith(sp.toLowerCase()) && (o.searchParams.delete("cityCode"), o.searchParams.delete("reservationTime"), sessionStorage.removeItem(ji), window.history.replaceState(window.history.state, "", `${o.pathname}${o.search}${o.hash}`));
 }, L4 = (o) => {
   sessionStorage.setItem(
     ap,
@@ -12786,7 +12785,7 @@ const hE = new URL("assets/setected-tvECHVG9.svg", import.meta.url).href, vE = n
       const a = n.tenant.id, l = (r == null ? void 0 : r.tenant) ?? "";
       a !== l && await o(l);
     }
-    Ad(r || { id: 0 }), ud((r == null ? void 0 : r.id) || 0), (n == null ? void 0 : n.flag) !== 4 && (window.__isAutoCloseApp = !1, R4(), window.location.reload());
+    Ad(r || { id: 0 }), ud((r == null ? void 0 : r.id) || 0), (n == null ? void 0 : n.flag) !== 4 && (R4(), window.__isAutoCloseApp = !1, window.location.reload());
   });
 }, x3 = jn.get("/menu/search"), m3 = jn.get("/searchhistory"), _3 = jn.post("/searchhistory"), C3 = jn.delete("/searchhistory"), y3 = jn.delete("/searchhistory/deleteone"), b3 = () => {
   const o = async () => {
@@ -16762,7 +16761,7 @@ W("@das-fed/web");
 const jS = [
   {
     path: Vt,
-    component: () => import("./index-DLlWagE3.js"),
+    component: () => import("./index-Doc6gRMQ.js"),
     meta: {
       layout: {
         minWidth: "0px"
@@ -16771,7 +16770,7 @@ const jS = [
   },
   {
     path: Cd,
-    component: () => import("./index-qekI7fBd.js")
+    component: () => import("./index-DLqeqqIt.js")
   }
 ], Y5 = {
   routes: jS,

package/{index-CYed9XU6.js → packages/main-app-framework/index-DLqeqqIt.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as r } from "vue";
-import { _ as c } from "./index-8eYS921_.js";
+import { _ as c } from "./index-CszZ6ZSo.js";
 const o = {};
 function t(n, _) {
   return r(), e("div");

package/{index-srSiACfB.js → packages/main-app-framework/index-Doc6gRMQ.js}

@@ -1,19 +1,19 @@
-import { defineComponent as C, computed as p, createElementBlock as S, openBlock as A, Fragment as I, createElementVNode as j, withDirectives as D, createVNode as d, unref as c, withCtx as E, vShow as P } from "vue";
-import { layoutData as $ } from "@das-fed/web/packages/layout/index";
-import { t as b } from "@das-fed/web/packages/i18n/index";
+import { defineComponent as C, computed as p, createElementBlock as S, openBlock as A, Fragment as I, createElementVNode as j, withDirectives as b, createVNode as d, unref as c, withCtx as D, vShow as E } from "vue";
+import { layoutData as P } from "@das-fed/web/packages/layout/index";
+import { t as $ } from "@das-fed/web/packages/i18n/index";
 import { DasAppContainer as x } from "@das-fed/ui/packages/business-components/app-container/index";
 import { DasSpin as T } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as L } from "@das-fed/utils/common-info";
 import { setShowLayout as q } from "@das-fed/utils/common-tools";
 import { createService as B } from "@das-fed/utils/create-api-service";
-import { u as N, p as R, a as l, c as m, b as V, l as F, g as K, d as M } from "./index-8eYS921_.js";
+import { u as N, p as R, a as l, c as m, b as V, l as F, g as K, d as M } from "./index-CszZ6ZSo.js";
 const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/auth/user/auth_code"), ne = /* @__PURE__ */ C({
   __name: "index",
   setup(J) {
     const { beforeEntryApp: g, entryApp: h } = N(), w = () => {
       const e = sessionStorage.getItem("iwmStationReservePath") || "/";
-      window.__isAutoCloseApp = !1, location.href = e;
-    }, _ = p(() => R.value.skinStyle), y = p(() => !!$.menu.items.length), k = p(() => {
+      window.__isAutoCloseApp = !1, window.open(e, "_blank");
+    }, _ = p(() => R.value.skinStyle), y = p(() => !!P.menu.items.length), k = p(() => {
       if (!l.value || !l.value.length) return [];
       const e = m(l.value);
       return Array.isArray(e) ? e.length ? (e.forEach((r) => {
@@ -31,7 +31,7 @@ const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/
     }, U = async (e, r = !0) => {
       if (!e) return;
       if (!sessionStorage.getItem("projectInfo")) {
-        window.confirm(b("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
+        window.confirm($("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
         return;
       }
       const t = m(e);
@@ -73,11 +73,11 @@ const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/
       null,
       [
         j("button", { onClick: w }, "测试跳转到工位预定"),
-        D(d(c(T), {
+        b(d(c(T), {
           full: "",
           spinning: c(V)
         }, {
-          default: E(() => [
+          default: D(() => [
             d(c(x), {
               theme: _.value,
               appCategorys: k.value,
@@ -87,7 +87,7 @@ const O = "v1", G = B(`/api/justauth/client/${O}`), H = G.get("/visitor/kingdee/
           _: 1
           /* STABLE */
         }, 8, ["spinning"]), [
-          [P, !y.value]
+          [E, !y.value]
         ])
       ],
       64

package/packages/main-app-framework/index.js

@@ -1,6 +1,6 @@
 import '@das-fed/web/packages/main-app-framework/style.css';
 import "vue";
-import { m as a } from "./index-DvSOhjci.js";
+import { m as a } from "./index-CszZ6ZSo.js";
 import "@das-fed/web/packages/i18n/index";
 export {
   a as mainAppFramework

package/types/main-app-framework/init-config/get-project-config/station-reserve-entry.d.ts

@@ -38,6 +38,8 @@ export declare const getStationReserveEntryParams: () => StationReserveEntryPara
  * 外部重新打开同一地址时不会携带该标记，因此仍会按最新 cityCode 重新选择项目。
  */
 export declare const markStationReserveProjectSwitchReload: () => void;
+/** 静默移除工位预定入口的城市和预约时间参数，避免项目切换刷新后再次城市匹配。 */
+export declare const clearStationReserveEntryQueryParams: () => void;
 /**
  * 保存第三方工位预定入口参数，供 IWM 后续业务读取。
  * 保留原始城市编码是为了避免下游业务丢失完整的行政区划路径。