@utogether/udp-core 2.0.0-beta.1 → 2.0.0-beta.3

package/src/views/uhome/dynamic-card.vue

@@ -1,32 +1,31 @@
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-12-26 13:53:05
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-30 09:23:25
+ * @FilePath: \udp-front\packages\udp-core\src\views\uhome\dynamic-card.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <div class="dynamic-card w-full">
     <vxe-row :gutter="[10, 10]" wrap>
-      <vxe-col v-for="data in dataList" :key="data.id" :span="data.span">
+      <vxe-col v-for="data in list" :key="data.id" :span="data.span">
         <vxe-card :title="data.title" :height="data.height" shadow>
-          <component :is="data.component" />
+          <dynamicComponent :data="data" />
         </vxe-card>
       </vxe-col>
     </vxe-row>
   </div>
 </template>
 <script setup lang="tsx">
-import { ref, onMounted, defineAsyncComponent } from 'vue';
-import { getServiceApi } from '../../api';
-import to from 'await-to-js';
+import dynamicComponent from './components/dynamic-component.vue';
 
-const dataList = ref([]);
-const getDataList = async () => {
-  const api = getServiceApi();
-  const [err, res]: any = await to(api.get('/ucrm/sysHomeConfig', { pageSize: 1000, pageNum: 1, enabled: '1' }));
-  if (err) return;
-  console.log(res);
-  res?.list.forEach(item => {
-    const data = { ...item, component: defineAsyncComponent(async () => import(`${item.url}.vue`)) };
-    dataList.value.push(data);
-  });
-};
-
-onMounted(() => {
-  getDataList();
+interface IProps {
+  list: IRecord;
+}
+withDefaults(defineProps<IProps>(), {
+  list: () => {
+    return [];
+  }
 });
 </script>

package/src/views/uhome/su-welcome.vue

@@ -2,14 +2,14 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2023-11-02 10:04:05
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-26 13:51:06
+ * @LastEditTime: 2026-01-06 18:25:02
  * @FilePath: /front-web-mes/src/views/uhome/su-welcome.vue
  * @Description: 欢迎页面
 -->
 <template>
   <div class="ut-home m-3">
     <!-- 顶部 -->
-    <div v-if="!has2upversion" class="h-32 mb-4 p-4 flex justify-between items-center bg-white home-page">
+    <div v-if="systemLayout.UserProfile" class="h-32 mb-4 p-4 flex justify-between items-center bg-white home-page">
       <div class="flex flex-row items-center flex-[2]">
         <div>
           <el-avatar size="large" class="text-4xl font-bold bg-[var(--el-color-primary)]">{{ firstName }}</el-avatar>
@@ -25,7 +25,7 @@
             <span class="inline-block"> 所属角色: </span>
             <div class="w-2/3">{{ getRole() }}</div>
           </div>
-          <div class="text-gray-500 flex">
+          <div v-if="getRole() !== '系统管理员'" class="text-gray-500 flex">
             <span class="inline-block"> 所属组织: </span>
             <div class="w-2/3">{{ getOrg() }}</div>
           </div>
@@ -39,46 +39,23 @@
       </div>
     </div>
     <el-row v-if="has2upversion">
-      <dynamic-card />
+      <dynamic-card :list="dataList" />
     </el-row>
-    <el-row v-if="!has2upversion" class="m-2" :gutter="10">
-      <el-col v-spinning="loading" :lg="24" :md="24" class="">
-        <el-card class="mb-2">
+    <el-row class="m-2" :gutter="10">
+      <el-col v-if="systemLayout.FavorityMenu" :lg="24" :md="24" class="">
+        <commonMenu />
+      </el-col>
+      <el-col v-if="systemLayout.ToDo" :lg="24" :md="24" class="">
+        <el-card>
           <template #header>
-            <div class="flex items-center justify-between dark:bg-black">
-              <span class="font-bold">常用菜单</span>
-              <span class="text-xs text-gray-400 cursor-pointer" @click="onFavoriteMenu">
-                <span>更多</span>
-                <i class="vxe-icon-arrow-right" />
-              </span>
+            <div class="font-bold">
+              <span>流程审批</span>
             </div>
           </template>
 
-          <div class="default:bg-white dark:bg-black">
-            <el-empty v-if="!menuList.length" :image-size="100" description="快来添加常用菜单吧!" class="p-0 pb-3" />
-            <ul
-              class="p-0 w-full h-full grid grid-rows-1 grid-cols-8 u-dashed-menu"
-              :class="{ 'grid-rows-2': menuList.length > 8 }"
-            >
-              <li
-                v-for="(item, idx) in menuList"
-                :key="item.id"
-                class="text-center list-none bg-white"
-                @click="onClickMenu(item)"
-              >
-                <div class="h-20 flex justify-center items-center flex-col">
-                  <div
-                    class="rounded-full w-10 h-10 flex items-center justify-center"
-                    :style="{ backgroundColor: getColor(idx) }"
-                  >
-                    <iconify-icon-offline :icon="item.icon || `ri:${icons[idx]}-line`" class="text-2xl text-white" />
-                  </div>
-                  <span class="text-xs mt-2">{{ item.menuName }}</span>
-                </div>
-              </li>
-            </ul>
+          <div>
+            <homeTodo />
           </div>
-          <div />
         </el-card>
       </el-col>
 
@@ -111,7 +88,7 @@
       </el-col>
 
       <!-- 右侧 -->
-      <el-col :xl="8" :lg="12" :md="24" class="">
+      <el-col v-if="systemLayout.Calendar" :xl="8" :lg="12" :md="24" class="">
         <el-card class="mb-2">
           <template #header>
             <div class="font-bold">
@@ -124,43 +101,35 @@
         </el-card>
       </el-col>
     </el-row>
-    <menu-favorite
-      v-if="showFavorite"
-      :data-source="menuList"
-      :user-name="systemHook.getUserInfo.userName"
-      :icons="icons"
-      @close="showFavorite = false"
-      @success="getMenuList"
-    />
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue';
-import { useRouter } from 'vue-router';
 import dayjs from 'dayjs';
-import { lunarCalendar, cookies } from '@utogether/utils';
+import { lunarCalendar } from '@utogether/utils';
+import to from 'await-to-js';
 import { useSystemStoreHook } from '../../store/modules/system';
-import { getServiceApi } from '../../api';
-import { kLOGINER } from '../../contant';
-import menuFavorite from './components/menu-favorite.vue';
+import commonMenu from './components/common-menu.vue';
+import homeTodo from './components/home-todo.vue';
 import dynamicCard from './dynamic-card.vue';
+import pkg from '../../../package.json';
+import { getServiceApi } from '../../api';
 
 defineOptions({ name: 'UdpWelcome' });
 
 const systemHook = useSystemStoreHook();
-const router = useRouter();
 
-const menuList = ref([]);
 const logList = ref([]);
-const showFavorite = ref(false);
-const loading = ref(false);
+const dataList = ref([]);
+const systemLayout = ref({ UserProfile: false, ToDo: false, FavorityMenu: false, Calendar: false, LoginInfo: false });
 
 const firstName = computed(() => {
   return systemHook.getUserInfo.name?.slice(0, 1);
 });
 
-const has2upversion = ref(+window.__UDP_VERSION__.substring(0, 1) > 1);
+const has2upversion = ref(true);
+// const has2upversion = ref(+window.__UDP_VERSION__.substring(0, 1) > 1);
 
 // 角色
 const getRole = () => {
@@ -178,9 +147,6 @@ const getOrg = () => {
   if (isAdmin) {
     return '【系统管理员】拥有所有组织';
   } else {
-    if (getRole() === '项目组管理员') {
-      return '【项目组管理员】拥有所有组织';
-    }
     return systemHook.getOrglist?.map(m => m.orgName).join(',');
   }
 };
@@ -198,25 +164,6 @@ const getLunarDay = () => {
   return `${cMonth}月${cDay}日 ${gzYear}${IMonthCn}${IDayCn} ${ncWeek}`;
 };
 
-/** 查询收藏菜单功能 */
-const getMenuList = () => {
-  const url = '/upfm/v1/menuFavority';
-  loading.value = true;
-  const query = { pageSize: 20, pageNum: 1, userName: cookies.get(kLOGINER) };
-  getServiceApi()
-    .get(url, query)
-    .then((res: IResponseData) => {
-      menuList.value = res?.list || [];
-    })
-    .finally(() => {
-      loading.value = false;
-    });
-};
-
-const onClickMenu = item => {
-  router.push(item.menuPath);
-};
-
 const getUserLog = () => {
   const url = '/upfm/v1/userMonitor';
   const query = { pageSize: 8, pageNum: 1, employeeName: systemHook.getUserInfo?.name };
@@ -227,39 +174,31 @@ const getUserLog = () => {
     });
 };
 
-const onFavoriteMenu = () => {
-  showFavorite.value = true;
+const getLayoutList = async () => {
+  const api = getServiceApi();
+  const [err, res]: any = await to(
+    api.get('/ucrm/sysHomeConfig', { pageSize: 1000, pageNum: 1, enabled: '1', isRoleFilter: 'Y' })
+  );
+  if (err) return;
+  systemLayout;
+  res?.list.forEach(m => {
+    if (m.type === 'custom') {
+      dataList.value.push(m);
+    } else {
+      systemLayout.value[m.code] = !!m.code;
+    }
+  });
 };
 
 onMounted(() => {
-  !has2upversion.value && getMenuList();
   getUserLog();
+  if (pkg.version.substring(0, 1) === '2') {
+    getLayoutList();
+  } else {
+    systemLayout.value = { UserProfile: false, ToDo: false, FavorityMenu: false, Calendar: false, LoginInfo: true };
+  }
 });
 
-const getColor = idx => {
-  const colorSet = ['#409eff', '#67c23a', '#13c2c2', '#e85f33', 'orange'];
-  return colorSet[idx % 5];
-};
-
-const icons = [
-  'community',
-  'shield-star',
-  'group',
-  'settings',
-  'star',
-  'train',
-  'send-plane',
-  'rocket',
-  'device',
-  'compass',
-  'map-pin',
-  'keynote',
-  'article',
-  'tv',
-  'database-2',
-  'calendar'
-];
-
 // 假期设置
 const holidays = [
   {
@@ -298,6 +237,8 @@ const statutoryHoliday = [
   { name: '中秋节', date: '2024-09-17' },
   { name: '国庆节', date: '2024-10-01' }
 ];
+
+console.log(pkg.name, pkg);
 </script>
 
 <style lang="scss" scoped>
@@ -310,15 +251,4 @@ const statutoryHoliday = [
     padding: 0 !important;
   }
 }
-
-// .u-dashed-menu {
-// li {
-// box-shadow: 1px 0 0 0 #e8e8e8, 0 1px 0 0 #e8e8e8, 1px 1px 0 0 #e8e8e8, 1px 0 0 0 #e8e8e8 inset,
-//   0 1px 0 0 #e8e8e8 inset;
-// }
-
-//   li:hover {
-//     box-shadow: 0 2px 8px rgb(0 0 0 / 15%);
-//   }
-// }
 </style>