@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.31

package/src/directives/permission/index.ts

@@ -8,7 +8,7 @@
  */
 import { usePermissionStoreHook } from '../../store/modules/permission';
 import type { Directive } from 'vue';
-import router from '../../router';
+import { router } from '../../router';
 import type { DirectiveBinding } from 'vue';
 
 export const auth: Directive = {

package/src/layout/components/lay-navbar/index.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 16:20:09
+ * @LastEditTime: 2025-08-29 08:57:37
  * @Description: file content
 -->
 <template>
@@ -20,16 +20,14 @@
 
     <div v-if="layout === 'vertical'" class="vertical-header-right">
       <!-- 业务单元选择 -->
-      <OrgSelect />
+      <OrgSelect v-if="sysConfig['orgTaggle'] === 'Y'" />
       <!-- 菜单搜索 -->
       <Search />
       <!-- 通知 -->
       <!-- <Notice id="header-notice" /> -->
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigge·r="click">
-        <globalization
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        />
+        <globalization class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden" />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
@@ -98,7 +96,7 @@ export default { name: 'NavBar' };
 </script>
 <script setup lang="ts">
 import { ref } from 'vue';
-// import { useRouter } from 'vue-router';
+import { storageLocal } from '@utogether/utils';
 import Hamburger from '../lay-sidebar/hamBurger.vue';
 import Breadcrumb from '../lay-sidebar/breadCrumb.vue';
 // import Notice from './lay-notice/index.vue';
@@ -109,6 +107,7 @@ import OrgSelect from '../lay-select-org/index.vue';
 import { useTranslationLang } from '../../hooks/useTranslationLang';
 import globalization from '../../../assets/svg/globalization.svg?component';
 import avatars from '../../../assets/images/avatars.jpg';
+import { kSYSCONFIG } from '../../../contant';
 
 // const router = useRouter();
 // const route = useRoute();
@@ -131,6 +130,9 @@ const {
 const { locale, translationCh, translationEn } = useTranslationLang();
 
 const record: IRecord = {};
+
+const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
+
 /**
  * @description: 重置密码
  */

package/src/layout/components/lay-panel/index.vue

@@ -1,150 +1,150 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:20
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 15:54:13
- * @Description: 个性化设置页面
--->
-<script setup lang="ts">
-import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
-import { useDataThemeChange } from '../../hooks/useDataThemeChange';
-import { onClickOutside } from '@vueuse/core';
-import { emitter } from '../../../utils/mitt';
-
-const target = ref(null);
-const show = ref<Boolean>(false);
-
-const iconClass = computed(() => {
-  return [
-    'w-[22px]',
-    'h-[22px]',
-    'flex',
-    'justify-center',
-    'items-center',
-    'outline-hidden',
-    'rounded-[4px]',
-    'cursor-pointer',
-    'transition-colors',
-    'hover:bg-[#0000000f]',
-    'dark:hover:bg-[#ffffff1f]',
-    'dark:hover:text-[#ffffffd9]'
-  ];
-});
-
-const { onReset } = useDataThemeChange();
-onClickOutside(target, (event: any) => {
-  if (event.clientX > target.value.offsetLeft) return;
-  show.value = false;
-});
-
-onMounted(() => {
-  emitter.on('openPanel', () => {
-    show.value = true;
-  });
-});
-
-onBeforeUnmount(() => {
-  // 解绑`openPanel`公共事件，防止多次触发
-  emitter.off('openPanel');
-});
-</script>
-
-<template>
-  <div :class="{ show }">
-    <div class="right-panel-background" />
-    <div ref="target" class="right-panel bg-bg_color">
-      <div
-        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
-      >
-        <h4 class="dark:text-white">{{ $t('message.tip.projectConfig') }}</h4>
-        <span
-          v-tippy="{
-            content: $t('message.tip.closeConfig'),
-            placement: 'bottom-start',
-            zIndex: 41000
-          }"
-          :class="iconClass"
-        >
-          <IconifyIconOffline
-            class="dark:text-white"
-            width="18px"
-            height="18px"
-            icon="ri:close-line"
-            @click="show = !show"
-          />
-        </span>
-      </div>
-      <el-scrollbar>
-        <slot />
-      </el-scrollbar>
-
-      <div
-        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
-      >
-        <el-button
-          v-tippy="{
-            content: $t('message.tip.toLogin'),
-            placement: 'left-start',
-            zIndex: 41000
-          }"
-          type="danger"
-          text
-          bg
-          @click="onReset"
-        >
-          {{ $t('message.tip.clearCache') }}
-        </el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-scrollbar) {
-  height: calc(100vh - 110px);
-}
-
-.right-panel-background {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: -1;
-  background: rgb(0 0 0 / 20%);
-  opacity: 0;
-  transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
-}
-
-.right-panel {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 40000;
-  width: 100%;
-  max-width: 300px;
-  box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
-  transform: translate(100%);
-  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
-}
-
-.show {
-  transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
-
-  .right-panel-background {
-    z-index: 20000;
-    width: 100%;
-    height: 100%;
-    opacity: 1;
-  }
-
-  .right-panel {
-    transform: translate(0);
-  }
-}
-
-.project-configuration {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 14px 20px;
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-31 10:15:40
+ * @Description: 个性化设置页面
+-->
+<script setup lang="ts">
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
+import { useDataThemeChange } from '../../hooks/useDataThemeChange';
+import { onClickOutside } from '@vueuse/core';
+import { emitter } from '../../../utils/mitt';
+
+const target = ref(null);
+const show = ref<Boolean>(false);
+
+const iconClass = computed(() => {
+  return [
+    'w-[22px]',
+    'h-[22px]',
+    'flex',
+    'justify-center',
+    'items-center',
+    'outline-hidden',
+    'rounded-[4px]',
+    'cursor-pointer',
+    'transition-colors',
+    'hover:bg-[#0000000f]',
+    'dark:hover:bg-[#ffffff1f]',
+    'dark:hover:text-[#ffffffd9]'
+  ];
+});
+
+const { onReset } = useDataThemeChange();
+onClickOutside(target, (event: any) => {
+  if (event.clientX > target.value.offsetLeft) return;
+  show.value = false;
+});
+
+onMounted(() => {
+  emitter.on('openPanel', () => {
+    show.value = true;
+  });
+});
+
+onBeforeUnmount(() => {
+  // 解绑`openPanel`公共事件，防止多次触发
+  emitter.off('openPanel');
+});
+</script>
+
+<template>
+  <div :class="{ show }">
+    <div class="right-panel-background" />
+    <div ref="target" class="right-panel bg-bg_color bg-white">
+      <div
+        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
+      >
+        <h4 class="dark:text-white">{{ $t('message.tip.projectConfig') }}</h4>
+        <span
+          v-tippy="{
+            content: $t('message.tip.closeConfig'),
+            placement: 'bottom-start',
+            zIndex: 41000
+          }"
+          :class="iconClass"
+        >
+          <IconifyIconOffline
+            class="dark:text-white"
+            width="18px"
+            height="18px"
+            icon="ri:close-line"
+            @click="show = !show"
+          />
+        </span>
+      </div>
+      <el-scrollbar>
+        <slot />
+      </el-scrollbar>
+
+      <div
+        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+      >
+        <el-button
+          v-tippy="{
+            content: $t('message.tip.toLogin'),
+            placement: 'left-start',
+            zIndex: 41000
+          }"
+          type="danger"
+          text
+          bg
+          @click="onReset"
+        >
+          {{ $t('message.tip.clearCache') }}
+        </el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-scrollbar) {
+  height: calc(100vh - 110px);
+}
+
+.right-panel-background {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+  background: rgb(0 0 0 / 20%);
+  opacity: 0;
+  transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
+}
+
+.right-panel {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 400000;
+  width: 100%;
+  max-width: 300px;
+  box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
+  transform: translate(100%);
+  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
+}
+
+.show {
+  transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
+
+  .right-panel-background {
+    z-index: 20000;
+    width: 100%;
+    height: 100%;
+    opacity: 1;
+  }
+
+  .right-panel {
+    transform: translate(0);
+  }
+}
+
+.project-configuration {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 14px 20px;
+}
+</style>

package/src/layout/components/lay-search/index.vue

@@ -16,7 +16,7 @@ function handleSearch() {
 
 <template>
   <div
-    class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
+    class="search-container w-[40px] h-[48px] px-2 flex justify-center items-center cursor-pointer navbar-bg-hover"
     @click="handleSearch"
   >
     <IconifyIconOffline icon="ri:search-line" />

package/src/layout/components/lay-select-org/index.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-27 16:16:11
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 14:27:14
+ * @LastEditTime: 2025-09-22 09:47:39
  * @Description: file content
 -->
 
@@ -10,12 +10,7 @@
 <template>
   <div style="width: 240px">
     <el-select v-model="orgId" size="small" @change="onChange">
-      <el-option
-        v-for="element in orgList"
-        :key="element.id"
-        :label="element.orgName"
-        :value="element.id"
-      />
+      <el-option v-for="element in orgList" :key="element.id" :label="element.orgName" :value="element.id" />
     </el-select>
   </div>
 </template>
@@ -47,8 +42,8 @@ const onChange = async orgId => {
     const [err, data]: [Error, any] = await to(getServiceApi().get('/uums/cusOrganization', query));
     if (!err && data.list?.length) {
       useSystemStoreHook().setInvOrgList(data.list || []);
-      const invOrg = data.list.find(f => f.orgId === orgId);
-      organizationId = invOrg.id;
+      const invOrg = data?.list?.find(f => f.orgId === orgId);
+      organizationId = invOrg?.id;
       useSystemStoreHook().setOrganizationId(organizationId);
     }
     const param = { orgId, organizationId };

package/src/layout/components/lay-sidebar/horizontal.vue

@@ -21,6 +21,10 @@ const routeStore = usePermissionStoreHook();
 const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
 
 const logo = ref(sysConfig['logo'] || utogether);
+const showTitle = ref(sysConfig['showTitle']);
+
+console.log({ showTitle });
+
 const {
   title,
   logout,
@@ -64,7 +68,7 @@ export default { name: 'LayoutHorizontal' };
   <div v-spinning="usePermissionStoreHook().wholeMenus.length === 0" class="horizontal-header">
     <div class="flex flex-1 horizontal-header-left" @click="backHome">
       <img :src="logo" class="h-full" />
-      <span class="text-xl u-project-text">{{ title }}</span>
+      <span v-if="showTitle === 'Y'" class="text-xl u-project-text">{{ title }}</span>
     </div>
     <el-scrollbar ref="refScrollbar" class="flex-[3]" @wheel.prevent="handleScroll">
       <template #default>
@@ -88,16 +92,14 @@ export default { name: 'LayoutHorizontal' };
     </el-scrollbar>
     <div class="horizontal-header-right flex-[2]">
       <!-- 业务单元选择 -->
-      <OrgSelect class="udp-horizontal" />
+      <OrgSelect v-if="sysConfig['orgTaggle'] === 'Y'" class="udp-horizontal" />
       <!-- 菜单搜索 -->
       <Search />
       <!-- 通知 -->
       <!-- <Notice id="header-notice" /> -->
       <!-- 国际化 -->
-      <el-dropdown id="header-translation" trigger="click">
-        <globalization
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        />
+      <el-dropdown id="header-translation" class="px-2" trigger="click">
+        <globalization class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden" />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item