@das-fed/web 7.1.0-qatar.2 → 7.1.0-qatar.3

package/{index-BUvWVE_h.js → index-CFzkerOh.js}

@@ -6,7 +6,7 @@ import { DasSpin as E } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as L } from "@das-fed/utils/common-info";
 import { setShowLayout as P } from "@das-fed/utils/common-tools";
 import { createService as q } from "@das-fed/utils/create-api-service";
-import { u as B, p as K, a as l, c as d, b as M, l as N, g as O, d as V } from "./index-BaX9zH-6.js";
+import { u as B, p as K, a as l, c as d, b as M, l as N, g as O, d as V } from "./index-BiA-PGky.js";
 const F = "v1", G = q(`/api/justauth/client/${F}`), H = G.get("/visitor/kingdee/auth/user/auth_code"), oe = /* @__PURE__ */ U({
   __name: "index",
   setup(J) {

package/{index-1_XnhEdp.js → index-ClEsjEKR.js}

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

package/index.js

@@ -1,4 +1,4 @@
-import { L as s, C as t, E as n, D as i, F as r, e as u, m as o, x as m, q as l, n as p, f as g, k as D, w as L, z as b, A as h, h as T, i as c, I as A, J as R, r as y, G as M, H as W, M as I, K as F, B as V, s as d, j as f, o as k, v, y as w, t as x } from "./index-BaX9zH-6.js";
+import { M as s, D as t, F as n, E as i, G as r, e as u, m, y as o, q as g, n as l, f as p, k as D, w as h, x as L, A as T, B as b, h as c, i as A, J as R, K as y, r as M, H as W, I, N as F, L as V, C as d, s as f, j as k, o as v, v as w, z as x, t as G } from "./index-BiA-PGky.js";
 export {
   s as DasMainAppLayout,
   t as DasWebLayout,
@@ -6,29 +6,30 @@ export {
   i as DasWebNav,
   r as DasWebTabs,
   u as createDasWebApp,
-  o as currentLang,
-  m as currentTheme,
-  l as customLangeData,
-  p as dir,
-  g as getI18nRule,
+  m as currentLang,
+  o as currentTheme,
+  g as customLangeData,
+  l as dir,
+  p as getI18nRule,
   D as getLang,
+  h as getTheme,
   L as getThemeRule,
-  b as getVar,
-  h as getVarValue,
-  T as i18n,
-  c as initI18n,
-  A as initMainApp,
-  R as initMicroApp,
-  y as initTheme,
-  M as layout,
-  W as layoutData,
-  I as mainAppFramework,
-  F as microFrontend,
-  V as setGlobalThemeRule,
-  d as setI18nRule,
-  f as setLang,
-  k as setLangRule,
-  v as setTheme,
-  w as setThemeRule,
-  x as t
+  T as getVar,
+  b as getVarValue,
+  c as i18n,
+  A as initI18n,
+  R as initMainApp,
+  y as initMicroApp,
+  M as initTheme,
+  W as layout,
+  I as layoutData,
+  F as mainAppFramework,
+  V as microFrontend,
+  d as setGlobalThemeRule,
+  f as setI18nRule,
+  k as setLang,
+  v as setLangRule,
+  w as setTheme,
+  x as setThemeRule,
+  G as t
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "7.1.0-qatar.2",
+  "version": "7.1.0-qatar.3",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "7.1.0-qatar.2",
-    "@das-fed/utils": "7.1.0-qatar.2",
-    "@das-fed/web": "7.1.0-qatar.2",
-    "@das-fed/web-components": "7.1.0-qatar.2",
+    "@das-fed/ui": "7.1.0-qatar.3",
+    "@das-fed/utils": "7.1.0-qatar.3",
+    "@das-fed/web": "7.1.0-qatar.3",
+    "@das-fed/web-components": "7.1.0-qatar.3",
     "@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.1.0-qatar.2",
+    "@das-fed/cli": "7.1.0-qatar.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

package/packages/theme/index.js

@@ -1,61 +1,63 @@
-import { ref as u, computed as b } from "vue";
-import { setThemeRule as p } from "@das-fed/web/packages/theme/index";
-const f = {
-  "--das-color-brand-primary": "#348CAB",
+import { ref as u, computed as F } from "vue";
+import { setThemeRule as b } from "@das-fed/web/packages/theme/index";
+const p = {
+  "--das-color-brand-primary": { light: "#276ff5", qatar: "#348CAB" },
   // 品牌主色-默认
-  "--das-color-brand-primary-light": "#EBFAFF",
+  "--das-color-brand-primary-light": { light: "#F2F9FF", qatar: "#EBFAFF" },
   // 品牌主色-浅色背景
-  "--das-color-brand-primary-hover": "#53A2BE",
+  "--das-color-brand-primary-hover": { light: "#5582F3", qatar: "#53A2BE" },
   // 品牌主色-悬停
-  "--das-color-brand-primary-active": "#24718C",
+  "--das-color-brand-primary-active": { light: "#3761CA", qatar: "#24718C" },
   // 品牌主色-激活
-  "--das-color-brand-primary-disabled": "#BEE4F1",
+  "--das-color-brand-primary-disabled": { light: "#B5CAFF", qatar: "#BEE4F1" },
   // 品牌主色-禁用
-  "--das-color-brand-primary-shadow": "rgba(52, 140, 171, 0.1)",
+  "--das-color-brand-primary-shadow": { light: "rgba(85, 130, 243, 0.1)", qatar: "rgba(52, 140, 171, 0.1)" },
   // 品牌主色-焦点阴影
-  "--das-color-brand-secondary": "#495CA6",
+  "--das-color-brand-secondary": { light: "#4367C1", qatar: "#495CA6" },
   // 品牌辅助色-默认
-  "--das-color-brand-secondary-hover": "#6578C2",
+  "--das-color-brand-secondary-hover": { light: "#4C74DA", qatar: "#6578C2" },
   // 品牌辅助色-悬停
-  "--das-color-brand-secondary-active": "#405192",
+  "--das-color-brand-secondary-active": { light: "#3B5AA9", qatar: "#405192" },
   // 品牌辅助色-激活
-  "--das-color-brand-secondary-disabled": "#C8D2F1",
+  "--das-color-brand-secondary-disabled": { light: "#95A4C8", qatar: "#C8D2F1" },
   // 品牌辅助色-禁用
-  "--das-color-success": "#1BA854",
+  "--das-color-success": { light: "#1BA854", qatar: "#1BA854" },
   // 功能色-成功
-  "--das-color-info": "#276FF5",
+  "--das-color-info": { light: "#276FF5", qatar: "#276FF5" },
   // 功能色-信息
-  "--das-color-warning": "#FF991C",
+  "--das-color-warning": { light: "#FF991C", qatar: "#FF991C" },
   // 功能色-警告
-  "--das-color-danger": "#FB2323",
+  "--das-color-danger": { light: "#FB2323", qatar: "#FB2323" },
   // 功能色-危险
-  "--das-color-danger-light": "#FFDBE0",
+  "--das-color-danger-light": { light: "#FFDBE0", qatar: "#FFDBE0" },
   // 功能色-危险浅色背景
-  "--das-color-text-title": "#212121",
+  "--das-color-link": { light: "#0E5FD8", qatar: "#348CAB" },
+  // 链接色
+  "--das-color-text-title": { light: "#212121", qatar: "#212121" },
   // 文字色-标题
-  "--das-color-text-body": "#666666",
+  "--das-color-text-body": { light: "#666666", qatar: "#666666" },
   // 文字色-正文
-  "--das-color-text-subtle": "#999999",
+  "--das-color-text-subtle": { light: "#999999", qatar: "#999999" },
   // 文字色-辅助
-  "--das-color-text-caption": "#B2B2B2",
+  "--das-color-text-caption": { light: "#B2B2B2", qatar: "#B2B2B2" },
   // 文字色-说明
-  "--das-color-bg-page": "#F2F7FF",
+  "--das-color-bg-page": { light: "#F2F7FF", qatar: "#F2F7FF" },
   // 背景色-页面
-  "--das-color-bg-container": "#FFFFFF",
+  "--das-color-bg-container": { light: "#FFFFFF", qatar: "#FFFFFF" },
   // 背景色-容器
-  "--das-color-bg-disabled": "#F5F5F5",
+  "--das-color-bg-disabled": { light: "#F5F5F5", qatar: "#F5F5F5" },
   // 背景色-禁用
-  "--das-color-mask-dark": "#000000",
+  "--das-color-mask-dark": { light: "#000000", qatar: "#000000" },
   // 遮罩色-深色
-  "--das-color-mask-dark-opacity": "rgba(0, 0, 0, 0.5)",
+  "--das-color-mask-dark-opacity": { light: "rgba(0, 0, 0, 0.5)", qatar: "rgba(0, 0, 0, 0.5)" },
   // 遮罩色-深色半透明
-  "--das-color-border-light": "#FFFFFF",
+  "--das-color-border-light": { light: "#FFFFFF", qatar: "#FFFFFF" },
   // 描边色-弱
-  "--das-color-border-base": "#E5E5E5",
+  "--das-color-border-base": { light: "#E5E5E5", qatar: "#E5E5E5" },
   // 描边色-常规
-  "--das-color-border-strong": "#D9D9D9"
+  "--das-color-border-strong": { light: "#D9D9D9", qatar: "#D9D9D9" }
   // 描边色-强调
-}, y = {
+}, f = {
   "--das-font-size-xxs": "10px",
   // 极小字号，用于角标、辅助标识、弱提示等低层级信息
   "--das-font-size-xs": "12px",
@@ -104,95 +106,112 @@ const f = {
   // 48px 字号对应行高
   "--das-line-height-7xl": "84px"
   // 56px 字号对应行高
-}, F = {
-  "--das-radius-none": "0px",
+}, q = {
+  "--das-menu-color-fog-blue-1": "#EBEFFF",
+  "--das-menu-color-fog-blue-2": "#CBD2F1",
+  "--das-menu-color-fog-blue-3": "#9EB0FA",
+  "--das-menu-color-fog-blue-4": "#8294DE",
+  "--das-menu-color-fog-blue-5": "#6578C2",
+  "--das-menu-color-fog-blue-6": "#495CA6",
+  "--das-menu-color-fog-blue-7": "#405192",
+  "--das-menu-color-fog-blue-8": "#38467E",
+  "--das-menu-color-fog-blue-9": "#2F3A6B",
+  "--das-menu-color-fog-blue-10": "#262F57"
+}, v = {
+  "--das-radius-none": { light: "0px", qatar: "0px" },
   // 无圆角
-  "--das-radius-xs": "3px",
+  "--das-radius-2xs": { light: "1px", qatar: "2px" },
+  // 极极小圆角，覆盖层错误边框等
+  "--das-radius-xs": { light: "0px", qatar: "3px" },
   // 极小圆角，多选框表格、下拉多选、多选树、多选列表等
-  "--das-radius-sm": "4px",
+  "--das-radius-sm": { light: "2px", qatar: "4px" },
   // 小尺寸圆角，按钮、输入框、标签等
-  "--das-radius-md": "6px",
+  "--das-radius-md": { light: "2px", qatar: "6px" },
   // 中尺寸圆角，搜索框、下拉面板等
-  "--das-radius-lg": "8px",
+  "--das-radius-lg": { light: "4px", qatar: "8px" },
   // 大尺寸圆角，卡片、弹窗、通知等
-  "--das-radius-xl": "12px",
+  "--das-radius-xl": { light: "4px", qatar: "12px" },
   // 超大尺寸圆角，强调容器或特殊面板
-  "--das-radius-pill": "999px"
+  "--das-radius-pill": { light: "999px", qatar: "999px" }
   // 胶囊圆角
-}, z = () => {
-  const s = /* @__PURE__ */ Object.assign({ "./module/color.ts": f, "./module/fontSize.ts": y, "./module/radius.ts": F });
-  Object.keys(s).map((e) => p(s[e]));
-}, r = u("light"), c = u({
+}, y = {
+  "--das-scrollbar-padding": "1px",
+  "--das-scrollbar-thumb-size": "8px"
+}, T = () => {
+  const a = /* @__PURE__ */ Object.assign({ "./module/color.ts": p, "./module/fontSize.ts": f, "./module/menu.ts": q, "./module/radius.ts": v, "./module/scrollbar.ts": y });
+  Object.keys(a).map((e) => b(a[e]));
+}, c = u("light"), g = u({
   light: {},
   dark: {}
-}), m = u({
+}), h = u({
   light: {},
   dark: {}
-}), v = "dasTheme", h = "das-theme", T = (s) => {
+}), B = "dasTheme", m = "das-theme", _ = (a) => {
   let e = {
     light: {},
     dark: {}
   };
-  if (!s) return e;
-  const { light: o = {}, dark: d = {}, base: a = {}, ...t } = s || {};
-  e.light = { ...o, ...a }, e.dark = d || {};
-  for (const l in t) {
-    const n = t[l];
-    if (typeof n == "string" && (e.light[l] = n), typeof n == "object")
-      for (const i in n)
-        e[i] || (e[i] = {}), e[i][l] || (e[i][l] = {}), e[i][l] = n[i];
+  if (!a) return e;
+  const { light: s = {}, dark: o = {}, qatar: l = {}, base: t = {}, ...r } = a || {};
+  e.light = { ...s, ...t }, e.dark = o || {};
+  for (const d in r) {
+    const i = r[d];
+    if (typeof i == "string" && (e.light[d] = i), typeof i == "object")
+      for (const n in i)
+        e[n] || (e[n] = {}), e[n][d] || (e[n][d] = {}), e[n][d] = i[n];
   }
   return e;
 };
-function _(s) {
-  const e = "das-global-theme", o = "das-custom-theme";
-  if (!document.getElementById(o)) {
-    const a = document.createElement("style");
-    a.appendChild(document.createTextNode("")), a.setAttribute("id", o), document.head.appendChild(a);
+function E(a) {
+  const e = "das-global-theme", s = "das-custom-theme";
+  if (!document.getElementById(s)) {
+    const l = document.createElement("style");
+    l.appendChild(document.createTextNode("")), l.setAttribute("id", s), document.head.appendChild(l);
   }
   if (!document.getElementById(e)) {
-    const a = document.createElement("style");
-    a.appendChild(document.createTextNode("")), a.setAttribute("id", e), document.head.appendChild(a);
+    const l = document.createElement("style");
+    l.appendChild(document.createTextNode("")), l.setAttribute("id", e), document.head.appendChild(l);
   }
-  s || (s = "custom");
-  let d = document.getElementById(o);
-  return s === "global" && (d = document.getElementById(e)), d.sheet;
+  a || (a = "custom");
+  let o = document.getElementById(s);
+  return a === "global" && (o = document.getElementById(e)), o.sheet;
 }
-const g = (s, e) => {
+const x = (a, e) => {
   e || (e = "custom");
-  const o = _(e), d = T(s);
-  for (const t in d) {
-    const l = d[t];
-    for (const n in l) {
-      const i = l[n], x = `${h}-${t}`;
-      o.insertRule(`.${x} { ${n}:${i} } `, o.cssRules.length);
+  const s = E(e), o = _(a);
+  for (const t in o) {
+    const r = o[t];
+    for (const d in r) {
+      const i = r[d], n = `${m}-${t}`;
+      s.insertRule(`.${n} { ${d}:${i} } `, s.cssRules.length);
     }
-    e === "global" && (m.value[t] || (m.value[t] = {}), m.value[t] = { ...m.value[t], ...l }), e === "custom" && (c.value[t] || (c.value[t] = {}), c.value[t] = { ...c.value[t], ...l });
+    e === "global" && (h.value[t] || (h.value[t] = {}), h.value[t] = { ...h.value[t], ...r }), e === "custom" && (g.value[t] || (g.value[t] = {}), g.value[t] = { ...g.value[t], ...r });
   }
-  const a = `${h}-${r.value}`;
-  document.body.classList.contains(a) || document.body.classList.add(a);
-}, C = async (s) => {
-  var d, a;
-  const e = window[v];
-  e && g(e, "global");
-  let o = Object.assign(((d = s == null ? void 0 : s.theme) == null ? void 0 : d.glob) || {});
-  (a = s == null ? void 0 : s.microApps) == null || a.map((t) => {
-    var l;
-    o = Object.assign(o, ((l = t.theme) == null ? void 0 : l.glob) || {});
-  }), Object.values(o).filter((t) => !!t).flat().map((t) => g(t));
-}, D = (s) => {
-  document.body.classList.add(`${h}-light`), s === "light" && document.body.classList.remove(`${h}-${r.value}`), r.value = s, document.body.classList.add(`${h}-${r.value}`);
-}, B = (s) => b(() => {
-  var e, o, d, a;
-  return ((o = (e = m.value) == null ? void 0 : e[r.value]) == null ? void 0 : o[s]) || ((a = (d = c.value) == null ? void 0 : d[r.value]) == null ? void 0 : a[s]) || s;
-}), k = (s) => `var(${s})`, R = B;
+  const l = `${m}-${c.value}`;
+  document.body.classList.contains(l) || document.body.classList.add(l);
+}, z = async (a) => {
+  var o, l;
+  const e = window[B];
+  e && x(e, "global");
+  let s = Object.assign(((o = a == null ? void 0 : a.theme) == null ? void 0 : o.glob) || {});
+  (l = a == null ? void 0 : a.microApps) == null || l.map((t) => {
+    var r;
+    s = Object.assign(s, ((r = t.theme) == null ? void 0 : r.glob) || {});
+  }), Object.values(s).filter((t) => !!t).flat().map((t) => x(t));
+}, $ = (a) => {
+  document.body.classList.add(`${m}-light`), a === "light" && document.body.classList.remove(`${m}-${c.value}`), c.value = a, document.body.classList.add(`${m}-${c.value}`);
+}, R = () => c.value, C = (a) => F(() => {
+  var e, s, o, l, t, r, d, i;
+  return ((s = (e = h.value) == null ? void 0 : e[c.value]) == null ? void 0 : s[a]) || ((l = (o = g.value) == null ? void 0 : o[c.value]) == null ? void 0 : l[a]) || ((r = (t = h.value) == null ? void 0 : t.light) == null ? void 0 : r[a]) || ((i = (d = g.value) == null ? void 0 : d.light) == null ? void 0 : i[a]) || a;
+}), k = (a) => `var(${a})`, I = C;
 export {
-  r as currentTheme,
-  B as getThemeRule,
+  c as currentTheme,
+  R as getTheme,
+  C as getThemeRule,
   k as getVar,
-  R as getVarValue,
-  C as initTheme,
-  z as setGlobalThemeRule,
-  D as setTheme,
-  g as setThemeRule
+  I as getVarValue,
+  z as initTheme,
+  T as setGlobalThemeRule,
+  $ as setTheme,
+  x as setThemeRule
 };

package/types/main-app-framework/init-config/get-tenant-config/index.d.ts

@@ -2,7 +2,7 @@
 export declare const getPersonalConfig: () => unknown;
 /** 获取租户详情 */
 export declare const getTenantConfig: () => unknown;
-/** 获取当前登录用户租户信息 == 用来获取语言类型判断是否需要显示语言切换栏目，为2则需要显示语言切换栏目  */
+/** 获取当前登录用户租户信息 == 用来获取语言类型判断是否需要显示语言切换栏目，小于2则不显示语言切换栏目  */
 export declare const getCurrentTenatConfig: () => unknown;
 /** 获取租户列表 */
 export declare const getTenantList: () => unknown;

package/types/theme/index.d.ts

@@ -4,10 +4,11 @@ declare const currentTheme: import('vue').Ref<any, any>;
 declare const setThemeRule: (data: any, type?: "global" | "custom") => void;
 declare const initTheme: (opt?: any) => any;
 declare const setTheme: (value: string) => void;
+declare const getTheme: () => any;
 /** 获取css var实际值 */
 declare const getThemeRule: (key: string) => import('vue').ComputedRef<any>;
 /** 获取css var字符串 */
 declare const getVar: (key: string) => string;
 /** 获取css var实际值 */
 declare const getVarValue: (key: string) => import('vue').ComputedRef<any>;
-export { initTheme, setTheme, getThemeRule, currentTheme, setThemeRule, getVar, getVarValue, setGlobalThemeRule };
+export { initTheme, setTheme, getTheme, getThemeRule, currentTheme, setThemeRule, getVar, getVarValue, setGlobalThemeRule, };