giime 0.9.0-beta.2 → 0.9.1

package/es/components/src/base/tooltip/index.d.ts

@@ -659,6 +659,7 @@ export declare const GmTooltip: import("../../../../utils").SFCWithInstall<{
     }>>, {
         offset: number;
         placement: import("@popperjs/core").Placement;
+        effect: import("element-plus").PopperEffect;
         content: string;
         visible: boolean | null;
         open: boolean;
@@ -666,7 +667,6 @@ export declare const GmTooltip: import("../../../../utils").SFCWithInstall<{
         showAfter: number;
         hideAfter: number;
         autoClose: number;
-        effect: import("element-plus").PopperEffect;
         teleported: boolean;
         trigger: import("element-plus").TooltipTriggerType | import("element-plus").TooltipTriggerType[];
         loop: boolean;
@@ -1029,6 +1029,7 @@ export declare const GmTooltip: import("../../../../utils").SFCWithInstall<{
     }, {}, {}, {}, {
         offset: number;
         placement: import("@popperjs/core").Placement;
+        effect: import("element-plus").PopperEffect;
         content: string;
         visible: boolean | null;
         open: boolean;
@@ -1036,7 +1037,6 @@ export declare const GmTooltip: import("../../../../utils").SFCWithInstall<{
         showAfter: number;
         hideAfter: number;
         autoClose: number;
-        effect: import("element-plus").PopperEffect;
         teleported: boolean;
         trigger: import("element-plus").TooltipTriggerType | import("element-plus").TooltipTriggerType[];
         loop: boolean;
@@ -1398,6 +1398,7 @@ export declare const GmTooltip: import("../../../../utils").SFCWithInstall<{
 }, string, {
     offset: number;
     placement: import("@popperjs/core").Placement;
+    effect: import("element-plus").PopperEffect;
     content: string;
     visible: boolean | null;
     open: boolean;
@@ -1405,7 +1406,6 @@ export declare const GmTooltip: import("../../../../utils").SFCWithInstall<{
     showAfter: number;
     hideAfter: number;
     autoClose: number;
-    effect: import("element-plus").PopperEffect;
     teleported: boolean;
     trigger: import("element-plus").TooltipTriggerType | import("element-plus").TooltipTriggerType[];
     loop: boolean;

package/es/components/src/base/treeSelect/TreeSelect.vue.d.ts

@@ -434,11 +434,11 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
 }, {
     offset: number;
     placement: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement) | ((new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement))[], import("element-plus").Placement, unknown>;
+    effect: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect))[], unknown, unknown>;
     data: import("element-plus/es/components/tree/src/tree.type").TreeData;
     multiple: boolean;
     disabled: boolean;
     props: import("element-plus/es/components/tree/src/tree.type").TreeOptionProps;
-    effect: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect))[], unknown, unknown>;
     valueKey: string;
     modelValue: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null) | ((new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null))[], unknown, unknown>;
     popperClass: string;

package/es/components/src/business/loginDialog/LoginDialog.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent, computed, ref, watch, onMounted, onUnmounted, createElementBlock, createCommentVNode, openBlock, createVNode, unref, withCtx } from 'vue';
-import { ElDialog } from 'element-plus';
+import { defineComponent, computed, ref, watch, onMounted, onUnmounted, createElementBlock, createCommentVNode, openBlock, createVNode, unref, withCtx, Fragment, createElementVNode, createTextVNode } from 'vue';
+import { ElDialog, ElResult, ElButton } from 'element-plus';
 import Cookies from 'js-cookie';
 import '../../../../hooks/index.mjs';
 import { useGlobalConfig } from '../../../../hooks/base/useGlobalConfig/index.mjs';
@@ -14,6 +14,7 @@ import { isString, isMobile, isDingTalk } from '../../../../utils/src/is.mjs';
 
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = ["src"];
+const _hoisted_3 = { class: "gm-py-10" };
 const loginEnvKey = "VITE_GIIME_LOGIN_URL";
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "LoginDialog",
@@ -60,6 +61,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         window.location.href = loginUrl.value;
       }
     };
+    const handleRetryLogin = () => {
+      loginStore.resetLoginBlock();
+      handleLogin();
+    };
     watch(
       () => loginStore.showLogin,
       (value) => {
@@ -119,6 +124,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 });
               }
               Cookies.set("token", data.data.token, { expires: now, domain: isProduction ? curDomain : void 0 });
+              if (importMetaEnv.value.DEV && data.data.tokens) {
+                data.data.tokens.forEach((token2) => {
+                  Cookies.set(token2.key, token2.value, { expires: now, domain: curDomain });
+                });
+              }
               if (!Cookies.get("sso_user_id") && data.data.userId) {
                 Cookies.set("sso_user_id", data.data.userId, {
                   expires: now,
@@ -146,16 +156,56 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return isSSRShowDialog.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(unref(ElDialog), {
           modelValue: unref(loginStore).showLogin,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(loginStore).showLogin = $event),
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(loginStore).showLogin = $event),
           width: "80%",
           "append-to-body": ""
         }, {
           default: withCtx(() => [
-            unref(loginStore).showLogin ? (openBlock(), createElementBlock("iframe", {
+            createCommentVNode(" \u6B63\u5E38\u767B\u5F55\u72B6\u6001\uFF1A\u663E\u793Aiframe "),
+            unref(loginStore).showLogin && !unref(loginStore).isLoginBlocked ? (openBlock(), createElementBlock("iframe", {
               key: 0,
               class: "gm-h-[600px] gm-w-full",
               src: loginUrl.value
-            }, null, 8, _hoisted_2)) : createCommentVNode("v-if", true)
+            }, null, 8, _hoisted_2)) : unref(loginStore).isLoginBlocked ? (openBlock(), createElementBlock(
+              Fragment,
+              { key: 1 },
+              [
+                createCommentVNode(" \u5F02\u5E38\u72B6\u6001\uFF1A\u663E\u793A\u9519\u8BEF\u63D0\u793A "),
+                createElementVNode("div", _hoisted_3, [
+                  createVNode(unref(ElResult), {
+                    icon: "warning",
+                    title: "\u767B\u5F55\u5F02\u5E38",
+                    "sub-title": "\u77ED\u65F6\u95F4\u5185\u591A\u6B21\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5"
+                  }, {
+                    extra: withCtx(() => [
+                      createVNode(unref(ElButton), {
+                        type: "primary",
+                        onClick: handleRetryLogin
+                      }, {
+                        default: withCtx(() => [
+                          createTextVNode("\u91CD\u65B0\u767B\u5F55")
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      }),
+                      createVNode(unref(ElButton), {
+                        onClick: _cache[0] || (_cache[0] = ($event) => unref(loginStore).showLogin = false)
+                      }, {
+                        default: withCtx(() => [
+                          createTextVNode("\u5173\u95ED")
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      })
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  })
+                ])
+              ],
+              2112
+              /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+            )) : createCommentVNode("v-if", true)
           ]),
           _: 1
           /* STABLE */

package/es/components/src/business/loginDialog/LoginDialog.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"LoginDialog.vue2.mjs","sources":["../../../../../../../packages/components/src/business/loginDialog/LoginDialog.vue"],"sourcesContent":["<script lang=\"ts\">\nconst loginEnvKey = 'VITE_GIIME_LOGIN_URL'\n</script>\n<template>\n  <div v-if=\"isSSRShowDialog\">\n    <el-dialog v-model=\"loginStore.showLogin\" width=\"80%\" append-to-body>\n      <iframe v-if=\"loginStore.showLogin\" class=\"gm-h-[600px] gm-w-full\" :src=\"loginUrl\" />\n    </el-dialog>\n  </div>\n</template>\n<script setup lang=\"ts\">\nimport { computed, onMounted, onUnmounted, ref, watch } from 'vue';\n// import { isObject } from '@vue/shared';\nimport { ElDialog } from 'element-plus';\nimport Cookies from 'js-cookie';\n// import router from 'vue-router';\nimport { useLoginStore } from '@giime/hooks';\nimport { useGlobalConfig } from '@giime/hooks/base/useGlobalConfig';\nimport { isDingTalk, isMobile, isString } from '@giime/utils';\nimport { getDomain, urlJoin } from '@giime/utils/src/http/url';\nimport { getTenantType, isGiikin } from '@giime/utils/src/tenant';\nimport { envConfigs } from '@giime/utils/src/http/createModes';\nimport { loginDialogProps } from './loginDialog';\nimport { resetEnvMode } from '@giime/constants/key';\n\nconst props = defineProps(loginDialogProps);\nconst router = useGlobalConfig('router');\n\n// const router = useRouter();\nconst route = computed(() => (router.value ? router.value.currentRoute.value : undefined));\nconst loginStore = useLoginStore();\nconst loginUrl = ref('');\n\n\nconst importMetaEnv = useGlobalConfig('env');\nconst isSSRShowDialog = ref(importMetaEnv.value.SSR === false);\n\n/**\n * 获取登录URL\n * 优先级：环境变量 > resetEnvMode > 租户类型判断 > 默认值\n */\nlet originLoginUrl = '';\n// 1. 优先使用环境变量配置的 loginUrl\nif (isString(importMetaEnv.value[loginEnvKey])) {\n  originLoginUrl = importMetaEnv.value[loginEnvKey];\n} else {\n  // 2. 根据租户类型获取登录路径\n  const loginPath = isGiikin() ? '/guard/sso/public/auth' : '/fe/basic/login';\n\n  // 3. 根据 resetEnvMode 获取环境配置并拼接完整URL\n  const resetMode = importMetaEnv.value[resetEnvMode];\n  const hostname = window.location.hostname;\n  // 获取域名对应的环境配置\n  const findEnvConfig = Object.values(envConfigs).find(config => config.domain === hostname);\n  if (resetMode && envConfigs[resetMode]) {\n    originLoginUrl = urlJoin(envConfigs[resetMode].url, loginPath);\n  } else if (findEnvConfig) {\n    // 4. 根据域名获取环境配置并拼接完整URL\n    originLoginUrl = urlJoin(findEnvConfig.url, loginPath);\n  } else {\n    // 5. 默认使用开发环境登录路径\n    originLoginUrl = urlJoin(envConfigs.develop.url, loginPath);\n  }\n}\nconst handleLogin = () => {\n  const protocol = window.location.protocol;\n  const host = window.location.host;\n  const myPath = window.location.pathname;\n  loginUrl.value = `${originLoginUrl}?_system=${props.system}`;\n  if (route.value && props.needScanningRouteNames.includes(route.value?.name?.toString() ?? '')) {\n    loginUrl.value += '&is_dashboard=1';\n  }\n\n  // 公司id\n  const guard_company = Cookies.get('guard_company');\n  if (guard_company) {\n    loginUrl.value += `&companyId=${guard_company}`;\n  }\n\n  loginUrl.value += `&${props.redirectUrlField}=${protocol}//${host}${myPath}`;\n\n  // eslint-disable-next-line no-console\n  console.log(loginUrl.value);\n  if (isMobile() || isDingTalk()) {\n    window.location.href = loginUrl.value;\n  }\n};\nwatch(\n  () => loginStore.showLogin,\n  value => {\n    if (value) {\n      handleLogin();\n    }\n  },\n);\n// 超过5分钟没扫码 会不能扫码  定时没登录的话3分钟刷新次\nconst reloadTimer = ref<number>();\nif (route.value) {\n  watch(route, (newValue, oldValue) => {\n    if (!oldValue || !newValue) {\n      return;\n    }\n    if (oldValue.name && props.needScanningRouteNames.includes(oldValue.name.toString())) {\n      window.clearInterval(reloadTimer.value);\n    }\n    if (newValue.name && props.needScanningRouteNames.includes(newValue.name.toString())) {\n      reloadTimer.value = window.setInterval(\n        () => {\n          if (!loginStore.showLogin) {\n            return;\n          }\n          // 登录超时后  3分钟刷新次页面\n          window.location.reload();\n        },\n        3 * 60 * 1000,\n      );\n    }\n  });\n}\n\ninterface GiikinLogged {\n  type: string;\n  data: {\n    token: string;\n    userId: string;\n    /**token 或者  loginSuccess 控制当前登录是否成功*/\n    loginSuccess?: boolean;\n    /**禁止写入cookie */\n    disabledWrite?: boolean;\n    disabledClose?: boolean;\n  };\n  cookies?: string[];\n}\n\nonMounted(() => {\n  isSSRShowDialog.value = true;\n  if (loginStore.showLogin) {\n    handleLogin();\n  }\n  // iframe事件监听\n  window.addEventListener('message', async e => {\n    // 刷新登陆状态\n    if (e.data.type == 'giikin-Logged') {\n      const data: GiikinLogged = e.data;\n      // eslint-disable-next-line no-console\n      console.log(e.data);\n      const token = Cookies.get('token');\n      // const isProduction = importMetaEnv.value.MODE === 'production' || importMetaEnv.value.MODE === 'giiktok.production';\n      const isProduction = importMetaEnv.value.MODE.includes('production');\n      if (\n        // 测试环境  但是需要登陆的情况\n        (!isProduction && data?.data?.token) ||\n        // 正式环境 登录成功  但是服务器token设置失败\n        (isProduction && !token && data?.data?.token)\n      ) {\n        // loginStore.userToken = data.data.token;\n        loginStore.userId = data.data.userId;\n        const now = new Date();\n        let time = now.getTime();\n        time += 8 * 60 * 60 * 1000; // 8 小时之后的时间（单位：毫秒）\n        now.setTime(time);\n        const curDomain = getDomain();\n        // 不禁用 则写入cookie\n        if (!data.data.disabledWrite) {\n          // cookieMap\n          if (data.cookies && Array.isArray(data.cookies)) {\n            data.cookies.forEach((cookie: string) => {\n              document.cookie = cookie;\n            });\n          }\n          // 可能出现测试环境调正式，需要写入token\n          Cookies.set('token', data.data.token, { expires: now, domain: isProduction ? curDomain : undefined });\n\n          if (!Cookies.get('sso_user_id') && data.data.userId) {\n            Cookies.set('sso_user_id', data.data.userId, {\n              expires: now,\n              domain: isProduction ? curDomain : undefined,\n            });\n          }\n        }\n      }\n      if (!data.data.disabledClose) {\n        // 触发登录成功监听\n        if (data?.data?.token || data?.data?.loginSuccess) {\n          await loginStore.triggerLoginResult(true);\n        }\n        // ElMessage.success('登录成功，请关闭弹窗');\n        loginStore.showLogin = false;\n        if (route.value && props.needRealodRouteNames.includes(route.value.name?.toString() ?? '')) {\n          window.location.reload();\n        }\n      }\n    }\n  });\n});\nonUnmounted(() => {\n  window.clearInterval(reloadTimer.value);\n});\n</script>\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"LoginDialog.vue2.mjs","sources":["../../../../../../../packages/components/src/business/loginDialog/LoginDialog.vue"],"sourcesContent":["<script lang=\"ts\">\nconst loginEnvKey = 'VITE_GIIME_LOGIN_URL'\n</script>\n<template>\n  <div v-if=\"isSSRShowDialog\">\n    <el-dialog v-model=\"loginStore.showLogin\" width=\"80%\" append-to-body>\n      <!-- 正常登录状态：显示iframe -->\n      <iframe v-if=\"loginStore.showLogin && !loginStore.isLoginBlocked\" class=\"gm-h-[600px] gm-w-full\" :src=\"loginUrl\" />\n      <!-- 异常状态：显示错误提示 -->\n      <div v-else-if=\"loginStore.isLoginBlocked\" class=\"gm-py-10\">\n        <el-result icon=\"warning\" title=\"登录异常\" sub-title=\"短时间内多次登录失败，请稍后重试\">\n          <template #extra>\n            <el-button type=\"primary\" @click=\"handleRetryLogin\">重新登录</el-button>\n            <el-button @click=\"loginStore.showLogin = false\">关闭</el-button>\n          </template>\n        </el-result>\n      </div>\n    </el-dialog>\n  </div>\n</template>\n<script setup lang=\"ts\">\nimport { computed, onMounted, onUnmounted, ref, watch } from 'vue';\n// import { isObject } from '@vue/shared';\nimport { ElButton, ElDialog, ElResult } from 'element-plus';\nimport Cookies from 'js-cookie';\n// import router from 'vue-router';\nimport { useLoginStore } from '@giime/hooks';\nimport { useGlobalConfig } from '@giime/hooks/base/useGlobalConfig';\nimport { isDingTalk, isMobile, isString } from '@giime/utils';\nimport { getDomain, urlJoin } from '@giime/utils/src/http/url';\nimport { getTenantType, isGiikin } from '@giime/utils/src/tenant';\nimport { envConfigs } from '@giime/utils/src/http/createModes';\nimport { loginDialogProps } from './loginDialog';\nimport { resetEnvMode } from '@giime/constants/key';\n\nconst props = defineProps(loginDialogProps);\nconst router = useGlobalConfig('router');\n\n// const router = useRouter();\nconst route = computed(() => (router.value ? router.value.currentRoute.value : undefined));\nconst loginStore = useLoginStore();\nconst loginUrl = ref('');\n\n\nconst importMetaEnv = useGlobalConfig('env');\nconst isSSRShowDialog = ref(importMetaEnv.value.SSR === false);\n\n/**\n * 获取登录URL\n * 优先级：环境变量 > resetEnvMode > 租户类型判断 > 默认值\n */\nlet originLoginUrl = '';\n// 1. 优先使用环境变量配置的 loginUrl\nif (isString(importMetaEnv.value[loginEnvKey])) {\n  originLoginUrl = importMetaEnv.value[loginEnvKey];\n} else {\n  // 2. 根据租户类型获取登录路径\n  const loginPath = isGiikin() ? '/guard/sso/public/auth' : '/fe/basic/login';\n\n  // 3. 根据 resetEnvMode 获取环境配置并拼接完整URL\n  const resetMode = importMetaEnv.value[resetEnvMode];\n  const hostname = window.location.hostname;\n  // 获取域名对应的环境配置\n  const findEnvConfig = Object.values(envConfigs).find(config => config.domain === hostname);\n  if (resetMode && envConfigs[resetMode]) {\n    originLoginUrl = urlJoin(envConfigs[resetMode].url, loginPath);\n  } else if (findEnvConfig) {\n    // 4. 根据域名获取环境配置并拼接完整URL\n    originLoginUrl = urlJoin(findEnvConfig.url, loginPath);\n  } else {\n    // 5. 默认使用开发环境登录路径\n    originLoginUrl = urlJoin(envConfigs.develop.url, loginPath);\n  }\n}\nconst handleLogin = () => {\n  const protocol = window.location.protocol;\n  const host = window.location.host;\n  const myPath = window.location.pathname;\n  loginUrl.value = `${originLoginUrl}?_system=${props.system}`;\n  if (route.value && props.needScanningRouteNames.includes(route.value?.name?.toString() ?? '')) {\n    loginUrl.value += '&is_dashboard=1';\n  }\n\n  // 公司id\n  const guard_company = Cookies.get('guard_company');\n  if (guard_company) {\n    loginUrl.value += `&companyId=${guard_company}`;\n  }\n\n  loginUrl.value += `&${props.redirectUrlField}=${protocol}//${host}${myPath}`;\n\n  // eslint-disable-next-line no-console\n  console.log(loginUrl.value);\n  if (isMobile() || isDingTalk()) {\n    window.location.href = loginUrl.value;\n  }\n};\n\n/** 重试登录：重置循环保护计数器并重新加载登录页 */\nconst handleRetryLogin = () => {\n  loginStore.resetLoginBlock();\n  handleLogin();\n};\nwatch(\n  () => loginStore.showLogin,\n  value => {\n    if (value) {\n      handleLogin();\n    }\n  },\n);\n// 超过5分钟没扫码 会不能扫码  定时没登录的话3分钟刷新次\nconst reloadTimer = ref<number>();\nif (route.value) {\n  watch(route, (newValue, oldValue) => {\n    if (!oldValue || !newValue) {\n      return;\n    }\n    if (oldValue.name && props.needScanningRouteNames.includes(oldValue.name.toString())) {\n      window.clearInterval(reloadTimer.value);\n    }\n    if (newValue.name && props.needScanningRouteNames.includes(newValue.name.toString())) {\n      reloadTimer.value = window.setInterval(\n        () => {\n          if (!loginStore.showLogin) {\n            return;\n          }\n          // 登录超时后  3分钟刷新次页面\n          window.location.reload();\n        },\n        3 * 60 * 1000,\n      );\n    }\n  });\n}\n\ninterface GiikinLogged {\n  type: string;\n  data: {\n    token: string;\n    userId: string;\n    /**token 或者  loginSuccess 控制当前登录是否成功*/\n    loginSuccess?: boolean;\n    /**禁止写入cookie */\n    disabledWrite?: boolean;\n    disabledClose?: boolean;\n    tokens: { key: string; value: string }[];\n  };\n  cookies?: string[];\n}\n\nonMounted(() => {\n  isSSRShowDialog.value = true;\n  if (loginStore.showLogin) {\n    handleLogin();\n  }\n  // iframe事件监听\n  window.addEventListener('message', async e => {\n    // 刷新登陆状态\n    if (e.data.type == 'giikin-Logged') {\n      const data: GiikinLogged = e.data;\n      // eslint-disable-next-line no-console\n      console.log(e.data);\n      const token = Cookies.get('token');\n      // const isProduction = importMetaEnv.value.MODE === 'production' || importMetaEnv.value.MODE === 'giiktok.production';\n      const isProduction = importMetaEnv.value.MODE.includes('production');\n      if (\n        // 测试环境  但是需要登陆的情况\n        (!isProduction && data?.data?.token) ||\n        // 正式环境 登录成功  但是服务器token设置失败\n        (isProduction && !token && data?.data?.token)\n      ) {\n        // loginStore.userToken = data.data.token;\n        loginStore.userId = data.data.userId;\n        const now = new Date();\n        let time = now.getTime();\n        time += 8 * 60 * 60 * 1000; // 8 小时之后的时间（单位：毫秒）\n        now.setTime(time);\n        const curDomain = getDomain();\n        // 不禁用 则写入cookie\n        if (!data.data.disabledWrite) {\n          // cookieMap\n          if (data.cookies && Array.isArray(data.cookies)) {\n            data.cookies.forEach((cookie: string) => {\n              document.cookie = cookie;\n            });\n          }\n          // 可能出现测试环境调正式，需要写入token\n          Cookies.set('token', data.data.token, { expires: now, domain: isProduction ? curDomain : undefined });\n          // 本地开发时 写入token\n          if (importMetaEnv.value.DEV && data.data.tokens) {\n            data.data.tokens.forEach((token: { key: string; value: string }) => {\n              Cookies.set(token.key, token.value, { expires: now, domain: curDomain });\n            });\n          }\n\n          if (!Cookies.get('sso_user_id') && data.data.userId) {\n            Cookies.set('sso_user_id', data.data.userId, {\n              expires: now,\n              domain: isProduction ? curDomain : undefined,\n            });\n          }\n        }\n      }\n      if (!data.data.disabledClose) {\n        // 触发登录成功监听\n        if (data?.data?.token || data?.data?.loginSuccess) {\n          await loginStore.triggerLoginResult(true);\n        }\n        // ElMessage.success('登录成功，请关闭弹窗');\n        loginStore.showLogin = false;\n        if (route.value && props.needRealodRouteNames.includes(route.value.name?.toString() ?? '')) {\n          window.location.reload();\n        }\n      }\n    }\n  });\n});\nonUnmounted(() => {\n  window.clearInterval(reloadTimer.value);\n});\n</script>\n"],"names":["token"],"mappings":"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"}

package/es/components/src/composite/selectOptions/SelectOptions.vue.d.ts

@@ -280,10 +280,10 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     offset: number;
     placement: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement) | ((new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement))[], import("element-plus").Placement, unknown>;
     options: import("./selectOptions").SelectOptionsOptionType[];
+    effect: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect))[], unknown, unknown>;
     multiple: boolean;
     disabled: boolean;
     props: import("element-plus/es/components/select-v2/src/useProps").Props;
-    effect: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect))[], unknown, unknown>;
     valueKey: string;
     modelValue: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null) | ((new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null))[], unknown, unknown>;
     popperClass: string;

package/es/components/src/composite/selectOptions/index.d.ts

@@ -273,10 +273,10 @@ export declare const GmSelectOptions: import("../../../../utils").SFCWithInstall
         offset: number;
         placement: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement) | ((new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement))[], import("element-plus").Placement, unknown>;
         options: import("./selectOptions").SelectOptionsOptionType[];
+        effect: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect))[], unknown, unknown>;
         multiple: boolean;
         disabled: boolean;
         props: import("element-plus/es/components/select-v2/src/useProps.js").Props;
-        effect: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect))[], unknown, unknown>;
         valueKey: string;
         modelValue: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null) | ((new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null))[], unknown, unknown>;
         popperClass: string;
@@ -450,10 +450,10 @@ export declare const GmSelectOptions: import("../../../../utils").SFCWithInstall
         offset: number;
         placement: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement) | ((new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement))[], import("element-plus").Placement, unknown>;
         options: import("./selectOptions").SelectOptionsOptionType[];
+        effect: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect))[], unknown, unknown>;
         multiple: boolean;
         disabled: boolean;
         props: import("element-plus/es/components/select-v2/src/useProps.js").Props;
-        effect: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect))[], unknown, unknown>;
         valueKey: string;
         modelValue: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null) | ((new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null))[], unknown, unknown>;
         popperClass: string;
@@ -631,10 +631,10 @@ export declare const GmSelectOptions: import("../../../../utils").SFCWithInstall
     offset: number;
     placement: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement) | ((new (...args: any[]) => "top" | "bottom" | "auto" | "left" | "right" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto-start" | "auto-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import("element-plus").Placement))[], import("element-plus").Placement, unknown>;
     options: import("./selectOptions").SelectOptionsOptionType[];
+    effect: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect))[], unknown, unknown>;
     multiple: boolean;
     disabled: boolean;
     props: import("element-plus/es/components/select-v2/src/useProps.js").Props;
-    effect: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper/index.js").PopperEffect))[], unknown, unknown>;
     valueKey: string;
     modelValue: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null) | ((new (...args: any[]) => string | number | boolean | Record<string, any> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[]) | (() => import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown> | import("element-plus/es/utils/index.js").EpPropMergeType<(ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[], unknown, unknown>[] | null))[], unknown, unknown>;
     popperClass: string;

package/es/components/src/composite/tableCustom/TableColumnVNodeRenderer.d.ts

@@ -0,0 +1,35 @@
+import type { TableColumnProProps } from '../tablePro/tableColumnPro/tableColumnPro';
+import type { PropType, VNode } from 'vue';
+declare const _default: import("vue").DefineComponent<{
+    vnode: {
+        type: (ObjectConstructor | ArrayConstructor)[];
+        required: true;
+    };
+    propsList: {
+        type: PropType<TableColumnProProps[]>;
+        default: () => never[];
+    };
+    defaultPropsList: {
+        type: PropType<TableColumnProProps[]>;
+        default: () => never[];
+    };
+}, () => (VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}> | null)[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    vnode: {
+        type: (ObjectConstructor | ArrayConstructor)[];
+        required: true;
+    };
+    propsList: {
+        type: PropType<TableColumnProProps[]>;
+        default: () => never[];
+    };
+    defaultPropsList: {
+        type: PropType<TableColumnProProps[]>;
+        default: () => never[];
+    };
+}>>, {
+    propsList: TableColumnProProps[];
+    defaultPropsList: TableColumnProProps[];
+}, {}>;
+export default _default;

package/es/components/src/composite/tableCustom/TableColumnVNodeRenderer.mjs

@@ -0,0 +1,102 @@
+import { defineComponent, computed, cloneVNode, h } from 'vue';
+
+var TableColumnVNodeRenderer = /* @__PURE__ */ defineComponent({
+  functional: true,
+  props: {
+    // 当前原始vnode vue模板中的attribute
+    vnode: {
+      type: [Object, Array],
+      required: true
+    },
+    // 真实渲染的propsList
+    propsList: {
+      type: Array,
+      default: () => []
+    },
+    defaultPropsList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  setup(props) {
+    const mergePropsList = computed(() => {
+      return props.propsList.map((it) => {
+        const findProp = props.defaultPropsList.find((item) => item.prop === it.prop);
+        if (findProp) {
+          return findProp;
+        }
+        return it;
+      });
+    });
+    const processVNode = (vnode) => {
+      if (!vnode) return null;
+      if (vnode.type?.name === "GmTableColumnPro") {
+        const propsConfig = mergePropsList.value.find((it) => it.prop === vnode.props?.prop);
+        if (propsConfig && (!propsConfig.isShow || propsConfig.type === "edit")) {
+          return null;
+        }
+        if (propsConfig) {
+          const newProps = {
+            ...vnode.props,
+            width: propsConfig.width,
+            label: propsConfig.label,
+            fixed: propsConfig.fixed
+          };
+          return cloneVNode(vnode, newProps);
+        }
+        return vnode;
+      }
+      if (vnode.children) {
+        let newChildren = vnode.children;
+        if (typeof vnode.children === "object" && vnode.children.default) {
+          const originalDefault = vnode.children.default;
+          newChildren = {
+            ...vnode.children,
+            default: (slotProps) => {
+              const childVnodes = originalDefault(slotProps);
+              if (Array.isArray(childVnodes)) {
+                return childVnodes.map(processVNode).filter(Boolean);
+              }
+              return processVNode(childVnodes);
+            }
+          };
+        } else if (Array.isArray(vnode.children)) {
+          newChildren = vnode.children.map(processVNode).filter(Boolean);
+        }
+        return cloneVNode(vnode, vnode.props, newChildren);
+      }
+      return vnode;
+    };
+    const render = computed(() => {
+      const vnodeArray = Array.isArray(props.vnode) ? props.vnode : [props.vnode];
+      const processedVnodes = vnodeArray.map((vnode) => processVNode(vnode)).filter(Boolean);
+      const topLevelColumns = [];
+      const multiLevelHeaders = [];
+      processedVnodes.forEach((vnode) => {
+        if (vnode?.type?.name === "GmTableColumnPro") {
+          topLevelColumns.push(vnode);
+        } else {
+          multiLevelHeaders.push(vnode);
+        }
+      });
+      const orderedColumns = [];
+      const processedProps = /* @__PURE__ */ new Set();
+      mergePropsList.value.forEach((propsConfig) => {
+        if (!propsConfig.isShow || propsConfig.type === "edit") {
+          return;
+        }
+        const matchedColumn = topLevelColumns.find((col) => col?.props?.prop === propsConfig.prop);
+        if (matchedColumn) {
+          orderedColumns.push(matchedColumn);
+          processedProps.add(propsConfig.prop);
+        }
+      });
+      const remainingColumns = topLevelColumns.filter((col) => col?.props?.prop && !processedProps.has(col.props.prop));
+      return [...multiLevelHeaders, ...orderedColumns, ...remainingColumns].map((vnode) => vnode ? h(vnode) : null).filter(Boolean);
+    });
+    return () => render.value;
+  }
+});
+
+export { TableColumnVNodeRenderer as default };
+//# sourceMappingURL=TableColumnVNodeRenderer.mjs.map

package/es/components/src/composite/tableCustom/TableColumnVNodeRenderer.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"TableColumnVNodeRenderer.mjs","sources":["../../../../../../../packages/components/src/composite/tableCustom/TableColumnVNodeRenderer.tsx"],"sourcesContent":["// TableColumnVNodeRenderer - 支持多级表头\nimport { computed, defineComponent, h, cloneVNode } from 'vue';\nimport type { TableColumnProProps } from '../tablePro/tableColumnPro/tableColumnPro';\nimport type { PropType, VNode } from 'vue';\n\nexport default defineComponent({\n  functional: true,\n  props: {\n    // 当前原始vnode vue模板中的attribute\n    vnode: {\n      type: [Object, Array],\n      required: true,\n    },\n    // 真实渲染的propsList\n    propsList: {\n      type: Array as PropType<TableColumnProProps[]>,\n      default: () => [],\n    },\n    defaultPropsList: {\n      type: Array as PropType<TableColumnProProps[]>,\n      default: () => [],\n    },\n  },\n  setup(props) {\n    /** 合并propsList和defaultPropsList */\n    const mergePropsList = computed(() => {\n      return props.propsList.map(it => {\n        const findProp = props.defaultPropsList.find(item => item.prop === it.prop);\n        if (findProp) {\n          return findProp;\n        }\n        return it;\n      });\n    });\n\n    /**\n     * 递归处理 vnode 树，应用 propsList 配置\n     * @param vnode 要处理的 vnode\n     * @returns 处理后的 vnode\n     */\n    const processVNode = (vnode: any): any => {\n      if (!vnode) return null;\n\n      // 如果是 GmTableColumnPro，查找并应用配置\n      if (vnode.type?.name === 'GmTableColumnPro') {\n        const propsConfig = mergePropsList.value.find(it => it.prop === vnode.props?.prop);\n\n        // 如果配置中标记为不显示或类型是 edit，跳过渲染\n        if (propsConfig && (!propsConfig.isShow || propsConfig.type === 'edit')) {\n          return null;\n        }\n\n        // 应用配置到 vnode props\n        if (propsConfig) {\n          const newProps = {\n            ...vnode.props,\n            width: propsConfig.width,\n            label: propsConfig.label,\n            fixed: propsConfig.fixed,\n          };\n          return cloneVNode(vnode, newProps);\n        }\n\n        return vnode;\n      }\n\n      // 如果是其他组件（如 gm-table-column 用于多级表头），递归处理子节点\n      if (vnode.children) {\n        let newChildren = vnode.children;\n\n        // 如果 children 是对象（包含 slots），递归处理 default slot\n        if (typeof vnode.children === 'object' && vnode.children.default) {\n          const originalDefault = vnode.children.default;\n          newChildren = {\n            ...vnode.children,\n            default: (slotProps: any) => {\n              const childVnodes = originalDefault(slotProps);\n              if (Array.isArray(childVnodes)) {\n                return childVnodes.map(processVNode).filter(Boolean);\n              }\n              return processVNode(childVnodes);\n            },\n          };\n        }\n        // 如果 children 是数组，递归处理每个子节点\n        else if (Array.isArray(vnode.children)) {\n          newChildren = vnode.children.map(processVNode).filter(Boolean);\n        }\n\n        return cloneVNode(vnode, vnode.props, newChildren);\n      }\n\n      return vnode;\n    };\n\n    const render = computed(() => {\n      const vnodeArray = Array.isArray(props.vnode) ? props.vnode : [props.vnode];\n\n      // 先处理所有 vnode\n      const processedVnodes = vnodeArray.map(vnode => processVNode(vnode)).filter(Boolean);\n\n      // 分离顶层列和多级表头\n      const topLevelColumns: any[] = [];\n      const multiLevelHeaders: any[] = [];\n\n      processedVnodes.forEach(vnode => {\n        // 如果是 GmTableColumnPro（顶层列），收集起来\n        if (vnode?.type?.name === 'GmTableColumnPro') {\n          topLevelColumns.push(vnode);\n        } else {\n          // 其他情况（多级表头等），保持原样\n          multiLevelHeaders.push(vnode);\n        }\n      });\n\n      // 按照 mergePropsList 的顺序来排序顶层列\n      const orderedColumns: any[] = [];\n      const processedProps = new Set<string>();\n\n      mergePropsList.value.forEach(propsConfig => {\n        // 如果配置中标记为不显示或类型是 edit，跳过渲染\n        if (!propsConfig.isShow || propsConfig.type === 'edit') {\n          return;\n        }\n\n        // 查找对应的顶层列\n        const matchedColumn = topLevelColumns.find(col => col?.props?.prop === propsConfig.prop);\n\n        if (matchedColumn) {\n          orderedColumns.push(matchedColumn);\n          processedProps.add(propsConfig.prop);\n        }\n      });\n\n      // 对于不在 mergePropsList 中的顶层列，也保留（可能是新增的列）\n      const remainingColumns = topLevelColumns.filter(col => col?.props?.prop && !processedProps.has(col.props.prop));\n\n      // 合并：多级表头 + 按顺序的顶层列 + 剩余的顶层列\n      return [...multiLevelHeaders, ...orderedColumns, ...remainingColumns].map(vnode => (vnode ? h(vnode) : null)).filter(Boolean);\n    });\n\n    return () => render.value;\n  },\n});\n"],"names":["functional","props","vnode","type","Object","Array","required","propsList","default","defaultPropsList","setup","mergePropsList","computed","map","it","findProp","find","item","prop","processVNode","name","propsConfig","value","isShow","newProps","width","label","fixed","cloneVNode","children","newChildren","originalDefault","slotProps","childVnodes","isArray","filter","Boolean","render","vnodeArray","processedVnodes","topLevelColumns","multiLevelHeaders","forEach","push","orderedColumns","processedProps","Set","matchedColumn","col","add","remainingColumns","has","h"],"mappings":"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"}

package/es/components/src/composite/tableCustom/TableCustom.vue.d.ts

@@ -109,7 +109,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "transition" | "showAfter" | "hideAfter" | "effect" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "effect" | "transition" | "showAfter" | "hideAfter" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -150,7 +150,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         default: string;
     };
     flexible: BooleanConstructor;
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "transition" | "showAfter" | "hideAfter" | "effect" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "effect" | "transition" | "showAfter" | "hideAfter" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
@@ -211,10 +211,10 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
             offset?: number | undefined;
             placement?: import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
             appendTo?: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>) | ((new (...args: any[]) => string | HTMLElement) | (() => import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>))[], unknown, unknown> | undefined;
+            effect?: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect))[], unknown, unknown> | undefined;
             transition?: string | undefined;
             showAfter?: number | undefined;
             hideAfter?: number | undefined;
-            effect?: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect) | ((new (...args: any[]) => string) | (() => import("element-plus/es/components/popper").PopperEffect))[], unknown, unknown> | undefined;
             popperClass?: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | {
                 [x: string]: boolean;
             } | (string | {
@@ -466,7 +466,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "transition" | "showAfter" | "hideAfter" | "effect" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "effect" | "transition" | "showAfter" | "hideAfter" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -507,7 +507,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         default: string;
     };
     flexible: BooleanConstructor;
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "transition" | "showAfter" | "hideAfter" | "effect" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus/es/components/tooltip").ElTooltipProps, "offset" | "placement" | "appendTo" | "effect" | "transition" | "showAfter" | "hideAfter" | "popperClass" | "popperOptions" | "showArrow" | "enterable">> | undefined>;
     tooltipFormatter: import("vue").PropType<import("element-plus/es/components/table/src/util").TableOverflowTooltipFormatter<any> | undefined>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {

package/es/components/src/composite/tableCustom/TableCustom.vue.mjs

@@ -2,7 +2,7 @@ import _sfc_main from './TableCustom.vue2.mjs';
 import './TableCustom.vue3.mjs';
 import _export_sfc from '../../../../_virtual/_plugin-vue_export-helper.mjs';
 
-var TableCustom = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-98c2e804"]]);
+var TableCustom = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1e1d88ac"]]);
 
 export { TableCustom as default };
 //# sourceMappingURL=TableCustom.vue.mjs.map

package/es/components/src/composite/tableCustom/TableCustom.vue2.mjs

@@ -5,14 +5,14 @@ import { getGmEvent } from '../../../../utils/src/elementPlus/event.mjs';
 import { TableCtxKey } from '../../../../constants/table.mjs';
 import { useElementRemainingHeight } from '../../../../hooks/base/useElementRemainingHeight/index.mjs';
 import TableOperateVNodeRenderer from '../tablePro/TableOperateVNodeRenderer.mjs';
-import TableColumnVNodeRenderer from '../tablePro/TableColumnVNodeRenderer.mjs';
 import { getVnodesByGmName } from '../tablePro/tableHelper.mjs';
 import { TableColumnProName, tableColumnProProps } from '../tablePro/tableColumnPro/tableColumnPro.mjs';
 import { GmCustomOperate } from './customOperate/index.mjs';
+import TableColumnVNodeRenderer from './TableColumnVNodeRenderer.mjs';
 import { tableCustomEmits, tableCustomProps } from './tableCustom.mjs';
 import { customOperateButtonProps } from './customOperate/customOperate.mjs';
 
-const _withScopeId = (n) => (pushScopeId("data-v-98c2e804"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-1e1d88ac"), n = n(), popScopeId(), n);
 const _hoisted_1 = { class: "gm-text-center" };
 const _hoisted_2 = {
   key: 0,
@@ -127,9 +127,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.disabledResetWidth) {
         return;
       }
-      if (colPropsList.value.some((it) => it.isShow && !it.width)) {
-        return;
-      }
       const minWidthCols = colPropsList.value.filter(
         // 是在展示中的列，并且不是操作列，并且设置了最小宽度
         (it) => it.isShow === true && it.type !== "edit" && it.prop !== "edit" && (it["min-width"] || it.minWidth)
@@ -220,8 +217,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                   })) : createCommentVNode("v-if", true),
                   createVNode(unref(TableColumnVNodeRenderer), {
                     vnode: tableColumnVnode.value,
-                    propsList: colPropsList.value
-                  }, null, 8, ["vnode", "propsList"]),
+                    propsList: colPropsList.value,
+                    defaultPropsList: colDefaultPropsList.value
+                  }, null, 8, ["vnode", "propsList", "defaultPropsList"]),
                   _ctx.customHeader || _ctx.customOperate ? (openBlock(), createBlock(_component_gm_table_column, {
                     key: 1,
                     prop: "gmEdit",