@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.20

package/src/layout/layoutView.vue

@@ -1,215 +1,215 @@
-<script setup lang="ts">
-import 'animate.css';
-import { ref, h, reactive, computed, onMounted, onBeforeMount, defineComponent } from 'vue';
-// 引入 src/components/ReIcon/src/offlineIcon.ts 文件中所有使用addIcon添加过的本地图标
-import '../components/ReIcon/src/offlineIcon';
-import { setType } from './types';
-import { useI18n } from 'vue-i18n';
-import { deviceDetection, useDark, useGlobal } from '@utogether/utils';
-import { useResizeObserver } from '@vueuse/core';
-import { useLayout } from './hooks/useLayout';
-import { useAppStoreHook } from '../store/modules/app';
-import { useSettingStoreHook } from '../store/modules/settings';
-import { useDataThemeChange } from './hooks/useDataThemeChange';
-
-import navbar from './components/lay-navbar/index.vue';
-import tag from './components/lay-tag/index.vue';
-import appMain from './components/lay-content/index.vue';
-import setting from './components/lay-setting/index.vue';
-import Vertical from './components/lay-sidebar/vertical.vue';
-import Horizontal from './components/lay-sidebar/horizontal.vue';
-import backTop from '../assets/svg/back_top.svg?component';
-
-const appWrapperRef = ref();
-const { t } = useI18n();
-const isMobile = deviceDetection();
-const settingHook = useSettingStoreHook();
-const { isDark } = useDark();
-
-const { $storage } = useGlobal();
-const { layout } = useLayout();
-
-const inIframe = window.self === window.top;
-
-const set: setType = reactive({
-  sidebar: computed(() => {
-    return useAppStoreHook().sidebar;
-  }),
-
-  device: computed(() => {
-    return useAppStoreHook().device;
-  }),
-
-  fixedHeader: computed(() => {
-    return settingHook.fixedHeader;
-  }),
-
-  classes: computed(() => {
-    return {
-      hideSidebar: !set.sidebar.opened,
-      openSidebar: set.sidebar.opened,
-      withoutAnimation: set.sidebar.withoutAnimation,
-      mobile: set.device === 'mobile'
-    };
-  }),
-
-  hideTabs: computed(() => {
-    return $storage?.configure.hideTabs;
-  })
-});
-
-function setTheme(layoutModel: string) {
-  window.document.body.setAttribute('layout', layoutModel);
-  $storage.layout = {
-    layout: `${layoutModel}`,
-    theme: $storage.layout?.theme,
-    darkMode: $storage.layout?.darkMode,
-    sidebarStatus: $storage.layout?.sidebarStatus,
-    epThemeColor: $storage.layout?.epThemeColor,
-    overallStyle: $storage.layout?.overallStyle
-  };
-}
-
-function toggle(device: string, bool: boolean) {
-  useAppStoreHook().toggleDevice(device);
-  useAppStoreHook().toggleSideBar(bool, 'resize');
-}
-
-// 判断是否可自动关闭菜单栏
-let isAutoCloseSidebar = true;
-
-// 监听容器
-useResizeObserver(appWrapperRef, entries => {
-  if (isMobile) return;
-  const entry = entries[0];
-  const { width } = entry.contentRect;
-  width <= 670 ? setTheme('vertical') : setTheme(useAppStoreHook().layout);
-  /** width app-wrapper类容器宽度
-   * 0 < width <= 760 隐藏侧边栏
-   * 760 < width <= 990 折叠侧边栏
-   * width > 990 展开侧边栏
-   */
-  if (width > 0 && width <= 760) {
-    toggle('mobile', false);
-    isAutoCloseSidebar = true;
-  } else if (width > 760 && width <= 990) {
-    if (isAutoCloseSidebar) {
-      toggle('desktop', false);
-      isAutoCloseSidebar = false;
-    }
-  } else if (width > 990 && !set.sidebar.isClickCollapse) {
-    toggle('desktop', true);
-    isAutoCloseSidebar = true;
-  } else {
-    toggle('desktop', false);
-    isAutoCloseSidebar = false;
-  }
-});
-
-onMounted(() => {
-  if (isMobile) {
-    toggle('mobile', false);
-  }
-});
-
-onBeforeMount(() => {
-  useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
-});
-
-const layoutHeader = defineComponent({
-  render() {
-    return h(
-      'div',
-      {
-        class: { 'fixed-header': set.fixedHeader },
-        style: [
-          set.hideTabs && layout.value.includes('horizontal')
-            ? isDark.value
-              ? 'box-shadow: 0 1px 4px #0d0d0d'
-              : 'box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08)'
-            : ''
-        ]
-      },
-      {
-        default: () => [
-          !settingHook.hiddenSideBar &&
-          (layout.value.includes('vertical') || layout.value.includes('mix'))
-            ? h(navbar)
-            : null,
-          !settingHook.hiddenSideBar && layout.value.includes('horizontal') ? h(Horizontal) : null,
-          h(tag)
-        ]
-      }
-    );
-  }
-});
-</script>
-
-<template>
-  <div ref="appWrapperRef" :class="['app-wrapper', set.classes]">
-    <div
-      v-show="set.device === 'mobile' && set.sidebar.opened && layout.includes('vertical')"
-      class="app-mask"
-      @click="useAppStoreHook().toggleSideBar()"
-    />
-    <Vertical
-      v-show="
-        inIframe && !settingHook.hiddenSideBar && (layout.includes('vertical') || layout.includes('mix'))
-      "
-    />
-    <div :class="['main-container', settingHook.hiddenSideBar ? 'main-hidden' : '']">
-      <div v-if="set.fixedHeader">
-        <layout-header v-if="inIframe" />
-        <!-- 主体内容 -->
-        <app-main :fixed-header="set.fixedHeader" />
-      </div>
-      <el-scrollbar v-else>
-        <template #default>
-          <div class="h-full">
-            <el-backtop :title="t('message.udp.backtop')" target=".main-container .el-scrollbar__wrap">
-              <backTop />
-            </el-backtop>
-            <layout-header v-if="inIframe" />
-            <!-- 主体内容 -->
-            <app-main :fixed-header="set.fixedHeader" />
-          </div>
-        </template>
-      </el-scrollbar>
-    </div>
-    <!-- 系统设置 -->
-    <setting />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.app-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-
-  &::after {
-    clear: both;
-    display: table;
-    content: '';
-  }
-
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
-  }
-}
-
-.app-mask {
-  position: absolute;
-  top: 0;
-  z-index: 999;
-  width: 100%;
-  height: 100%;
-  background: #000;
-  opacity: 0.3;
-}
-
-.re-screen {
-  margin-top: 12px;
-}
-</style>
+<script setup lang="ts">
+import 'animate.css';
+import { ref, h, reactive, computed, onMounted, onBeforeMount, defineComponent } from 'vue';
+// 引入 src/components/ReIcon/src/offlineIcon.ts 文件中所有使用addIcon添加过的本地图标
+import '../components/ReIcon/src/offlineIcon';
+import { setType } from './types';
+import { useI18n } from 'vue-i18n';
+import { deviceDetection, useDark, useGlobal } from '@utogether/utils';
+import { useResizeObserver } from '@vueuse/core';
+import { useLayout } from './hooks/useLayout';
+import { useAppStoreHook } from '../store/modules/app';
+import { useSettingStoreHook } from '../store/modules/settings';
+import { useDataThemeChange } from './hooks/useDataThemeChange';
+
+import navbar from './components/lay-navbar/index.vue';
+import tag from './components/lay-tag/index.vue';
+import appMain from './components/lay-content/index.vue';
+import setting from './components/lay-setting/index.vue';
+import Vertical from './components/lay-sidebar/vertical.vue';
+import Horizontal from './components/lay-sidebar/horizontal.vue';
+import backTop from '../assets/svg/back_top.svg?component';
+
+const appWrapperRef = ref();
+const { t } = useI18n();
+const isMobile = deviceDetection();
+const settingHook = useSettingStoreHook();
+const { isDark } = useDark();
+
+const { $storage } = useGlobal();
+const { layout } = useLayout();
+
+const inIframe = window.self === window.top;
+
+const set: setType = reactive({
+  sidebar: computed(() => {
+    return useAppStoreHook().sidebar;
+  }),
+
+  device: computed(() => {
+    return useAppStoreHook().device;
+  }),
+
+  fixedHeader: computed(() => {
+    return settingHook.fixedHeader;
+  }),
+
+  classes: computed(() => {
+    return {
+      hideSidebar: !set.sidebar.opened,
+      openSidebar: set.sidebar.opened,
+      withoutAnimation: set.sidebar.withoutAnimation,
+      mobile: set.device === 'mobile'
+    };
+  }),
+
+  hideTabs: computed(() => {
+    return $storage?.configure.hideTabs;
+  })
+});
+
+function setTheme(layoutModel: string) {
+  window.document.body.setAttribute('layout', layoutModel);
+  $storage.layout = {
+    layout: `${layoutModel}`,
+    theme: $storage.layout?.theme,
+    darkMode: $storage.layout?.darkMode,
+    sidebarStatus: $storage.layout?.sidebarStatus,
+    epThemeColor: $storage.layout?.epThemeColor,
+    overallStyle: $storage.layout?.overallStyle
+  };
+}
+
+function toggle(device: string, bool: boolean) {
+  useAppStoreHook().toggleDevice(device);
+  useAppStoreHook().toggleSideBar(bool, 'resize');
+}
+
+// 判断是否可自动关闭菜单栏
+let isAutoCloseSidebar = true;
+
+// 监听容器
+useResizeObserver(appWrapperRef, entries => {
+  if (isMobile) return;
+  const entry = entries[0];
+  const { width } = entry.contentRect;
+  width <= 670 ? setTheme('vertical') : setTheme(useAppStoreHook().layout);
+  /** width app-wrapper类容器宽度
+   * 0 < width <= 760 隐藏侧边栏
+   * 760 < width <= 990 折叠侧边栏
+   * width > 990 展开侧边栏
+   */
+  if (width > 0 && width <= 760) {
+    toggle('mobile', false);
+    isAutoCloseSidebar = true;
+  } else if (width > 760 && width <= 990) {
+    if (isAutoCloseSidebar) {
+      toggle('desktop', false);
+      isAutoCloseSidebar = false;
+    }
+  } else if (width > 990 && !set.sidebar.isClickCollapse) {
+    toggle('desktop', true);
+    isAutoCloseSidebar = true;
+  } else {
+    toggle('desktop', false);
+    isAutoCloseSidebar = false;
+  }
+});
+
+onMounted(() => {
+  if (isMobile) {
+    toggle('mobile', false);
+  }
+});
+
+onBeforeMount(() => {
+  useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
+});
+
+const layoutHeader = defineComponent({
+  render() {
+    return h(
+      'div',
+      {
+        class: { 'fixed-header': set.fixedHeader },
+        style: [
+          set.hideTabs && layout.value.includes('horizontal')
+            ? isDark.value
+              ? 'box-shadow: 0 1px 4px #0d0d0d'
+              : 'box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08)'
+            : ''
+        ]
+      },
+      {
+        default: () => [
+          !settingHook.hiddenSideBar &&
+          (layout.value.includes('vertical') || layout.value.includes('mix'))
+            ? h(navbar)
+            : null,
+          !settingHook.hiddenSideBar && layout.value.includes('horizontal') ? h(Horizontal) : null,
+          h(tag)
+        ]
+      }
+    );
+  }
+});
+</script>
+
+<template>
+  <div ref="appWrapperRef" :class="['app-wrapper', set.classes]">
+    <div
+      v-show="set.device === 'mobile' && set.sidebar.opened && layout.includes('vertical')"
+      class="app-mask"
+      @click="useAppStoreHook().toggleSideBar()"
+    />
+    <Vertical
+      v-show="
+        inIframe && !settingHook.hiddenSideBar && (layout.includes('vertical') || layout.includes('mix'))
+      "
+    />
+    <div :class="['main-container', settingHook.hiddenSideBar ? 'main-hidden' : '']">
+      <div v-if="set.fixedHeader">
+        <layout-header v-if="inIframe" />
+        <!-- 主体内容 -->
+        <app-main :fixed-header="set.fixedHeader" />
+      </div>
+      <el-scrollbar v-else>
+        <template #default>
+          <div class="h-full">
+            <el-backtop :title="t('message.udp.backtop')" target=".main-container .el-scrollbar__wrap">
+              <backTop />
+            </el-backtop>
+            <layout-header v-if="inIframe" />
+            <!-- 主体内容 -->
+            <app-main :fixed-header="set.fixedHeader" />
+          </div>
+        </template>
+      </el-scrollbar>
+    </div>
+    <!-- 系统设置 -->
+    <setting />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.app-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+
+  &::after {
+    clear: both;
+    display: table;
+    content: '';
+  }
+
+  &.mobile.openSidebar {
+    position: fixed;
+    top: 0;
+  }
+}
+
+.app-mask {
+  position: absolute;
+  top: 0;
+  z-index: 999;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  opacity: 0.3;
+}
+
+.re-screen {
+  margin-top: 12px;
+}
+</style>

package/src/layout/types.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
- * @LastEditors: wei.li
- * @LastEditTime: 2024-06-27 13:51:19
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-19 12:07:59
  * @Description: file content
  */
 
@@ -11,6 +11,7 @@ import type { IconifyIcon } from '@iconify/vue';
 export const routerArrays: Array<RouteConfigs> = [
   {
     path: '/welcome',
+    name: 'Welcome',
     meta: {
       title: 'message.udp.home',
       icon: 'home-filled'

package/src/main.ts

@@ -1,21 +1,22 @@
 /*
- * @Author: wei.li
- * @Date: 2022-10-18 18:13:54
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-07-25 13:38:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 15:35:32
- * @Description: file content
+ * @LastEditTime: 2025-10-19 12:15:08
+ * @FilePath: \udp-front\packages\udp-core\src\main.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { createApp, type Directive } from 'vue';
 import App from './App.vue';
-import router from './router';
+// import router from './router';
 import { setViews } from './router';
 import { setupStore } from './store';
 import { setConfig, setSystemEnv } from './config';
-import { useI18n } from '../src/plugins/i18n';
+import { useI18n, transformI18n } from '../src/plugins/i18n';
 import { setTableConfig } from '../src/plugins/vxe-table';
 import { injectResponsiveStorage } from './utils/storage';
 import hasAuthority from './utils/authority';
-import { getServiceApi, getBaseURL, setRouter } from './api';
+import { getServiceApi, getBaseURL, setRouter, setBaseUrl } from './api';
 
 import 'nprogress/nprogress.css';
 // 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
@@ -25,26 +26,29 @@ import './style/reset.scss';
 // 导入公共样式
 import './style/index.scss';
 
-import 'viewerjs/dist/viewer.css';
+// import 'viewerjs/dist/viewer.css';
 
-import VueViewer from 'v-viewer';
+// import VueViewer from 'v-viewer';
 
 // import SuTable from './components/SuTable/SuTable.vue';
 
-// import {
-//   UtButton,
-// UGrid,
-//   UtDivider,
-// UtModalForm2,
-// FormUpload2
-//   UtForm,
-//   UtModalGrid,
-//   UtContent,
-//   UtCountdown,
-//   UtIconSelect,
-//   UtCalendar
-// uAttachment
-// } from './components/udp';
+import {
+  // UtButton,
+  // utLov2,
+  // UGrid,
+  //   UtDivider,
+  // UtModalForm2
+  // FormUpload2,
+  UtForm2,
+  UtGrid2
+  // UtContent2,
+  // UtStampBadge2
+  // UtModalGrid2
+  // UtUpload2
+  //   UtIconSelect,
+  //   UtCalendar
+  // uAttachment
+} from './components/udp';
 
 const app = createApp(App);
 
@@ -66,6 +70,7 @@ const setGlobal = app => {
   app.config.globalProperties.$hasAuthority = hasAuthority;
   app.config.globalProperties.$serviceApi = getServiceApi();
   app.config.globalProperties.$url = getBaseURL();
+  window.$i18n = transformI18n;
 };
 
 const setGlobalDirective = app => {
@@ -74,12 +79,12 @@ const setGlobalDirective = app => {
   });
 };
 
-const init = ({ config, lang, views, env, tableConfig }) => {
+const init = ({ router, config, lang, views, env, tableConfig }) => {
+  setViews(views, router);
   app.use(router);
   setRouter(router);
   setConfig(app, config);
   setSystemEnv(env);
-  setViews(views);
   setTableConfig(tableConfig);
   return new Promise(resolve => {
     useI18n(app, lang);
@@ -87,16 +92,19 @@ const init = ({ config, lang, views, env, tableConfig }) => {
     app.component('FontIcon', FontIcon);
     // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
     //   .component('UtDivider', UtDivider)
-    // .component('UtModalForm2', UtModalForm2)
-    // app.component('FormUpload2', FormUpload2);
-    //   .component('UtForm', UtForm)
-    //   .component('UtContent', UtContent)
+    // app.component('UtModalForm2', UtModalForm2);
+    app.component('UtGrid2', UtGrid2);
+    app.component('UtForm2', UtForm2);
+    // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
-    //   .component('UtCountdown', UtCountdown)
+    // app.component('FormUpload2', FormUpload2);
     //   .component('UtCalendar', UtCalendar)
+    // app.component('UtContent2', UtContent2);
+    // app.component('UtStampBadge2', UtStampBadge2);
     //   .component('UtModalGrid', UtModalGrid);
-    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
+    // app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
     setGlobal(app);
+    setBaseUrl(getBaseURL());
     setGlobalDirective(app);
     // 全局组件
     setupStore(app);

package/src/plugins/i18n/en.ts

@@ -13,7 +13,6 @@ export default {
     login: 'Login',
     home: 'Home',
     logout: 'Logout',
-    userName: 'User Name',
     password: 'Password',
     passwordReset: 'Password Reset',
     oldPwd: 'Old Password',
@@ -78,7 +77,30 @@ export default {
     lastMonth: 'Last Month',
     threeMonth: 'Three Month',
     halfYear: 'Half Year',
-    anniversary: 'Anniversary'
+    anniversary: 'Anniversary',
+
+    newVersion: '检测到新版本',
+    updatenow: '立即更新',
+    updateLater: '稍后更新',
+    appVersion: '版本号',
+    buildNo: '构建号',
+    versionInfo: '版本信息',
+    isForceUpdate: '安装方式',
+    downloadUrl: 'APK文件',
+    forceUpdate: '强制更新',
+    freeUpdate: '自主更新',
+
+    userName: 'User Name',
+    userCode: 'user Code',
+    sysType: 'User Type',
+
+    orgCode: 'Business Unit Code',
+    orgName: 'Business Unit Name',
+    orgAlias: 'Business Unit Alias',
+    orgDesc: 'Business Unit Descript',
+
+    organizationName: 'Organization Name',
+    organizationCode: 'Organization Code'
   },
   btn: {
     add: 'Add',
@@ -108,6 +130,7 @@ export default {
     fetch: 'Fetch',
     edit: 'Edit',
     export: 'Export',
+    import: 'Import',
     encode: 'Encode',
     importJSON: 'Import Data',
     look: 'Look',
@@ -160,6 +183,7 @@ export default {
     yAxis: 'yAxis'
   },
 
+  add: 'Add',
   operate: 'Operate',
   emptyData: 'Empty Data',
 
@@ -241,13 +265,10 @@ export default {
   responseContent: 'Response Content',
   stacktrace: 'Stacktrace',
 
-  userName: 'User Name',
-  userCode: 'user Code',
   status: 'Status',
   email: 'Email',
   userPassword: 'Password',
   remarks: 'Remarks',
-  sysType: 'User Type',
   userPwd: 'Password',
   unitName: 'Department',
 
@@ -267,14 +288,6 @@ export default {
   deptType: 'Department Type',
   deletePartment: 'There are child levels in the department, please delete the child level first',
 
-  orgCode: 'Business Unit Code',
-  orgName: 'Business Unit Name',
-  orgAlias: 'Business Unit Alias',
-  orgDesc: 'Business Unit Descript',
-
-  organizationName: 'Organization Name',
-  organizationCode: 'Organization Code',
-
   lovCode: 'LovCode',
   lovName: 'lovName',
   valueField: 'valueField',