@utogether/udp-core 1.0.2 → 1.0.4-beta.1

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

@@ -1,143 +1,136 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:20
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-05 10:43:53
- * @Description: 主页面
--->
-<script setup lang="ts">
-import { h, computed, Transition, defineComponent } from 'vue';
-import { useGlobal } from '@utogether/utils';
-import { useI18n } from 'vue-i18n';
-import { useTags } from '../../hooks/useTag';
-import backTop from '../../../assets/svg/back_top.svg?component';
-import { usePermissionStoreHook } from '../../../store/modules/permission';
-
-const props = defineProps({
-  fixedHeader: Boolean
-});
-
-const { showModel } = useTags();
-const { t } = useI18n();
-const { $storage, $config } = useGlobal();
-
-const keepAlive = computed(() => {
-  return $config?.KeepAlive;
-});
-
-const transitions = computed(() => {
-  return route => {
-    return route.meta.transition;
-  };
-});
-
-const hideTabs = computed(() => {
-  return $storage?.configure.hideTabs;
-});
-const layout = computed(() => {
-  return $storage?.layout.layout === 'vertical';
-});
-
-const getSectionStyle = computed(() => {
-  // 在iframe中默认就是审批
-  return window.top === window.self
-    ? [
-        hideTabs.value && layout ? 'padding-top: 48px;' : '',
-        !hideTabs.value && layout
-          ? showModel.value == 'chrome'
-            ? 'padding-top: 85px;'
-            : 'padding-top: 81px;'
-          : '',
-        hideTabs.value && !layout.value ? 'padding-top: 48px' : '',
-        !hideTabs.value && !layout.value
-          ? showModel.value == 'chrome'
-            ? 'padding-top: 85px;'
-            : 'padding-top: 81px;'
-          : '',
-        props.fixedHeader ? '' : 'padding-top: 0;'
-      ]
-    : 'padding-top: 0';
-});
-
-const transitionMain = defineComponent({
-  props: {
-    route: {
-      type: undefined,
-      required: true
-    }
-  },
-  render() {
-    const transitionName = transitions.value(this.route)?.name || 'fade-transform';
-    const enterTransition = transitions.value(this.route)?.enterTransition;
-    const leaveTransition = transitions.value(this.route)?.leaveTransition;
-    return h(
-      Transition,
-      {
-        name: enterTransition ? 'pure-classes-transition' : transitionName,
-        enterActiveClass: enterTransition ? `animate__animated ${enterTransition}` : undefined,
-        leaveActiveClass: leaveTransition ? `animate__animated ${leaveTransition}` : undefined,
-        mode: 'out-in',
-        appear: true
-      },
-      {
-        default: () => [this.$slots.default()]
-      }
-    );
-  }
-});
-</script>
-
-<template>
-  <section
-    :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
-    :style="getSectionStyle"
-  >
-    <router-view>
-      <template #default="{ Component, route }">
-        <el-scrollbar v-if="props.fixedHeader">
-          <template #default>
-            <div class="h-full">
-              <el-backtop :title="t('message.udp.backtop')" target=".app-main .el-scrollbar__wrap">
-                <backTop />
-              </el-backtop>
-              <transitionMain :route="route">
-                <keep-alive v-if="keepAlive" :include="usePermissionStoreHook().cachePageList">
-                  <component :is="Component" :key="route.fullPath" class="main-content" />
-                </keep-alive>
-                <component :is="Component" v-else :key="route.fullPath" class="main-content" />
-              </transitionMain>
-            </div>
-          </template>
-        </el-scrollbar>
-        <div v-else>
-          <transitionMain :route="route">
-            <keep-alive v-if="keepAlive" :include="usePermissionStoreHook().cachePageList">
-              <component :is="Component" :key="route.fullPath" class="main-content" />
-            </keep-alive>
-            <component :is="Component" v-else :key="route.fullPath" class="main-content" />
-          </transitionMain>
-        </div>
-      </template>
-    </router-view>
-  </section>
-</template>
-
-<style scoped>
-.app-main {
-  position: relative;
-  width: 100%;
-  height: 100vh;
-  overflow-x: hidden;
-}
-
-.app-main-nofixed-header {
-  position: relative;
-  width: 100%;
-  min-height: 100vh;
-}
-
-.main-content {
-  /* padding: 6px; */
-  height: 100%;
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-18 09:35:26
+ * @Description: 主页面
+-->
+<script setup lang="ts">
+import { h, computed, Transition, defineComponent } from 'vue';
+import { useGlobal } from '@utogether/utils';
+import { useI18n } from 'vue-i18n';
+import { useTags } from '../../hooks/useTag';
+import backTop from '../../../assets/svg/back_top.svg?component';
+import { usePermissionStoreHook } from '../../../store/modules/permission';
+
+const props = defineProps({
+  fixedHeader: Boolean
+});
+
+const { showModel } = useTags();
+const { t } = useI18n();
+const { $storage, $config } = useGlobal();
+
+const keepAlive = computed(() => {
+  return $config?.KeepAlive;
+});
+
+const transitions = computed(() => {
+  return route => {
+    return route.meta.transition;
+  };
+});
+
+const hideTabs = computed(() => {
+  return $storage?.configure.hideTabs;
+});
+const layout = computed(() => {
+  return $storage?.layout.layout === 'vertical';
+});
+
+const getSectionStyle = computed(() => {
+  // 在iframe中默认就是审批
+  return window.top === window.self
+    ? [
+        hideTabs.value && layout ? 'padding-top: 48px;' : '',
+        !hideTabs.value && layout ? (showModel.value == 'chrome' ? 'padding-top: 85px;' : 'padding-top: 81px;') : '',
+        hideTabs.value && !layout.value ? 'padding-top: 48px' : '',
+        !hideTabs.value && !layout.value
+          ? showModel.value == 'chrome'
+            ? 'padding-top: 85px;'
+            : 'padding-top: 81px;'
+          : '',
+        props.fixedHeader ? '' : 'padding-top: 0;'
+      ]
+    : 'padding-top: 0';
+});
+
+const transitionMain = defineComponent({
+  props: {
+    route: {
+      type: undefined,
+      required: true
+    }
+  },
+  render() {
+    const transitionName = transitions.value(this.route)?.name || 'fade-transform';
+    const enterTransition = transitions.value(this.route)?.enterTransition;
+    const leaveTransition = transitions.value(this.route)?.leaveTransition;
+    return h(
+      Transition,
+      {
+        name: enterTransition ? 'pure-classes-transition' : transitionName,
+        enterActiveClass: enterTransition ? `animate__animated ${enterTransition}` : undefined,
+        leaveActiveClass: leaveTransition ? `animate__animated ${leaveTransition}` : undefined,
+        mode: 'out-in',
+        appear: true
+      },
+      {
+        default: () => [this.$slots.default()]
+      }
+    );
+  }
+});
+</script>
+
+<template>
+  <section :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']" :style="getSectionStyle">
+    <router-view>
+      <template #default="{ Component, route }">
+        <el-scrollbar v-if="props.fixedHeader">
+          <template #default>
+            <div class="h-full">
+              <el-backtop :title="t('message.udp.backtop')" style="z-index: 100" target=".app-main .el-scrollbar__wrap">
+                <backTop />
+              </el-backtop>
+              <transitionMain :route="route">
+                <keep-alive v-if="keepAlive" :include="usePermissionStoreHook().cachePageList">
+                  <component :is="Component" :key="route.fullPath" class="main-content" />
+                </keep-alive>
+                <component :is="Component" v-else :key="route.fullPath" class="main-content" />
+              </transitionMain>
+            </div>
+          </template>
+        </el-scrollbar>
+        <div v-else>
+          <transitionMain :route="route">
+            <keep-alive v-if="keepAlive" :include="usePermissionStoreHook().cachePageList">
+              <component :is="Component" :key="route.fullPath" class="main-content" />
+            </keep-alive>
+            <component :is="Component" v-else :key="route.fullPath" class="main-content" />
+          </transitionMain>
+        </div>
+      </template>
+    </router-view>
+  </section>
+</template>
+
+<style scoped>
+.app-main {
+  position: relative;
+  width: 100%;
+  height: 100vh;
+  overflow-x: hidden;
+}
+
+.app-main-nofixed-header {
+  position: relative;
+  width: 100%;
+  min-height: 100vh;
+}
+
+.main-content {
+  /* padding: 6px; */
+  height: 100%;
+}
+</style>

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

@@ -19,7 +19,7 @@ const props = defineProps({
 const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
 
 const title = sysConfig['title'];
-const showTitle = sysConfig['showTitle'];
+const showTitle = ref(sysConfig['showTitle']);
 const logo = ref(sysConfig['logo'] || utogether);
 </script>
 

package/src/layout/layoutView.vue

@@ -132,8 +132,7 @@ const layoutHeader = defineComponent({
       },
       {
         default: () => [
-          !settingHook.hiddenSideBar &&
-          (layout.value.includes('vertical') || layout.value.includes('mix'))
+          !settingHook.hiddenSideBar && (layout.value.includes('vertical') || layout.value.includes('mix'))
             ? h(navbar)
             : null,
           !settingHook.hiddenSideBar && layout.value.includes('horizontal') ? h(Horizontal) : null,
@@ -153,9 +152,7 @@ const layoutHeader = defineComponent({
       @click="useAppStoreHook().toggleSideBar()"
     />
     <Vertical
-      v-show="
-        inIframe && !settingHook.hiddenSideBar && (layout.includes('vertical') || layout.includes('mix'))
-      "
+      v-show="inIframe && !settingHook.hiddenSideBar && (layout.includes('vertical') || layout.includes('mix'))"
     />
     <div :class="['main-container', settingHook.hiddenSideBar ? 'main-hidden' : '']">
       <div v-if="set.fixedHeader">
@@ -166,7 +163,11 @@ const layoutHeader = defineComponent({
       <el-scrollbar v-else>
         <template #default>
           <div class="h-full">
-            <el-backtop :title="t('message.udp.backtop')" target=".main-container .el-scrollbar__wrap">
+            <el-backtop
+              :title="t('message.udp.backtop')"
+              style="z-index: 100"
+              target=".main-container .el-scrollbar__wrap"
+            >
               <backTop />
             </el-backtop>
             <layout-header v-if="inIframe" />

package/src/main.ts

@@ -36,7 +36,7 @@ import {
   // utLov2,
   //   UtDivider,
   // UtModalForm2
-  // FormUpload2,
+  FormUpload2,
   // UtForm2,
   UtGrid2
   // UtContent2
@@ -95,7 +95,7 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     // app.component('UtForm2', UtForm2);
     // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
-    // app.component('FormUpload2', FormUpload2);
+    app.component('FormUpload2', FormUpload2);
     //   .component('UtCalendar', UtCalendar)
     // app.component('UtContent2', UtContent2);
     // app.component('UtStampBadge2', UtStampBadge2);

package/src/plugins/i18n/zh.ts

@@ -70,6 +70,7 @@ export default {
     startValue: '开始值',
     currentValue: '当前值',
     haveBeenUsed: '使用中',
+    description: '描述',
 
     unitName: '单位名称',
     unitCode: '单位编码',

package/src/plugins/vxe-table/index.ts

@@ -1,116 +1,116 @@
-/*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2024-06-05 14:32:03
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-04 13:58:45
- * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import 'xe-utils';
-import { merge, toDateString, getWhatDay } from 'xe-utils';
-import { geti18n, transformI18n } from '../i18n/index';
-// import { storageLocal } from '@utogether/utils';
-import { VxetableRender } from '@utogether/utils';
-// import { VxetableRender } from './render';
-import { getServiceApi } from '../../api';
-
-import VXETable, { VxeUI } from 'vxe-table';
-// import './render.tsx';
-
-// const dict = storageLocal.getItem('kLov');
-VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
-setCommands();
-
-// 全局默认参数
-const defaultConfig = {
-  // 对组件内置的提示语进行国际化翻译
-  // @ts-ignore
-  i18n: (key, args) => geti18n().global.t(key, args),
-  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
-  translate(key) {
-    // 例如，只翻译 "message." 开头的键值
-    const NAMESPACED = ['message.', 'el.'];
-    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
-      return geti18n().global.t.call(geti18n().global.locale, key);
-    }
-    return key;
-  }
-};
-
-export function setTableConfig(config = {}) {
-  VXETable.setConfig(merge(defaultConfig, config));
-
-  VxeUI.interceptor.add('event.clearEdit', {
-    tableInterceptorMethod(params) {
-      const { $event } = params;
-      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
-    }
-  });
-}
-
-export function setTheme(theme) {
-  // 切换为暗黑主题
-  VxeUI.setTheme(theme);
-}
-
-function setCommands() {
-  // 定义选中日期今天指令
-  VxeUI.commands.add('utTodyay', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(new Date(), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期昨天指令
-  VxeUI.commands.add('utYesterDay', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期最近一周指令
-  VxeUI.commands.add('utRecentWeek', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -7), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近一个月指令
-  VxeUI.commands.add('utRecentMonth', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -30), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近三个月指令
-  VxeUI.commands.add('utRecentThreeMonth', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -90), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近半年指令
-  VxeUI.commands.add('utRecentHalfYear', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -180), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期最近半年指令
-  VxeUI.commands.add('utRecentYear', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -365), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-}
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2024-06-05 14:32:03
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-09 08:57:02
+ * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import 'xe-utils';
+import { merge, toDateString, getWhatDay } from 'xe-utils';
+import { geti18n, transformI18n } from '../i18n/index';
+// import { storageLocal } from '@utogether/utils';
+// import { VxetableRender } from '@utogether/utils';
+import { VxetableRender } from './render';
+import { getServiceApi } from '../../api';
+
+import VXETable, { VxeUI } from 'vxe-table';
+// import './render.tsx';
+
+// const dict = storageLocal.getItem('kLov');
+VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
+setCommands();
+
+// 全局默认参数
+const defaultConfig = {
+  // 对组件内置的提示语进行国际化翻译
+  // @ts-ignore
+  i18n: (key, args) => geti18n().global.t(key, args),
+  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
+  translate(key) {
+    // 例如，只翻译 "message." 开头的键值
+    const NAMESPACED = ['message.', 'el.'];
+    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
+      return geti18n().global.t.call(geti18n().global.locale, key);
+    }
+    return key;
+  }
+};
+
+export function setTableConfig(config = {}) {
+  VXETable.setConfig(merge(defaultConfig, config));
+
+  VxeUI.interceptor.add('event.clearEdit', {
+    tableInterceptorMethod(params) {
+      const { $event } = params;
+      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
+    }
+  });
+}
+
+export function setTheme(theme) {
+  // 切换为暗黑主题
+  VxeUI.setTheme(theme);
+}
+
+function setCommands() {
+  // 定义选中日期今天指令
+  VxeUI.commands.add('utTodyay', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(new Date(), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期昨天指令
+  VxeUI.commands.add('utYesterDay', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期最近一周指令
+  VxeUI.commands.add('utRecentWeek', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -7), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近一个月指令
+  VxeUI.commands.add('utRecentMonth', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -30), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近三个月指令
+  VxeUI.commands.add('utRecentThreeMonth', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -90), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近半年指令
+  VxeUI.commands.add('utRecentHalfYear', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -180), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期最近半年指令
+  VxeUI.commands.add('utRecentYear', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -365), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+}