@utogether/udp-core 1.0.4 → 2.0.0-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

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-25 13:38:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-14 10:52:54
+ * @LastEditTime: 2025-12-26 14:35:03
  * @FilePath: \udp-front\packages\udp-core\src\main.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -26,17 +26,13 @@ import './style/reset.scss';
 // 导入公共样式
 import './style/index.scss';
 
-// import 'viewerjs/dist/viewer.css';
-
-// import VueViewer from 'v-viewer';
-
 // import SuTable from './components/SuTable/SuTable.vue';
 
 import {
   // utLov2,
   //   UtDivider,
   // UtModalForm2
-  // FormUpload2,
+  FormUpload2,
   // UtForm2,
   UtGrid2
   // UtContent2
@@ -78,6 +74,7 @@ const setGlobalDirective = app => {
 };
 
 const init = ({ router, config, lang, views, env, tableConfig }) => {
+  console.log('view', views);
   setViews(views, router);
   app.use(router);
   setRouter(router);
@@ -95,7 +92,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

@@ -58,6 +58,7 @@ export default {
     browser: '浏览器',
     dictCode: '字典编码',
     dictName: '字典名称',
+    dictDesc: '字典描述',
     dictType: '字典类型',
 
     ruleCode: '规则代码',
@@ -70,6 +71,7 @@ export default {
     startValue: '开始值',
     currentValue: '当前值',
     haveBeenUsed: '使用中',
+    description: '描述',
 
     unitName: '单位名称',
     unitCode: '单位编码',
@@ -112,7 +114,14 @@ export default {
     appupper: '已上架',
     applower: '已下架',
     isApprovalPage: '审批页面',
-    showLink: '菜单可见'
+    showLink: '菜单可见',
+
+    componentCode: '组件编码',
+    componentTitle: '组件标题',
+    componentSpan: '栅格列数(24等分)',
+    componentHeight: '组件高度',
+    componentPath: '组件路径',
+    componentRole: '角色'
   },
   btn: {
     passwordReset: '密码重置',
@@ -176,6 +185,7 @@ export default {
     disabled: '禁用',
     enable: '启用',
     flowDesign: '流程设计',
+    resetPassword: '重置密码',
 
     bankinfo: '银行账号'
   },
@@ -339,10 +349,12 @@ export default {
     emptyAuth: '无系统权限, 请先给用户分配角色重试',
     initPassword: `初始密码为:【{code}】,请及时修改密码`,
     loginFailure: '用户名或密码不能为空',
+    selectRole: '请先勾选角色数据',
     confirmSync: '确认同步数据吗?',
     updatenow: '立即更新',
     newVersion: '检测到新版本',
-    updateLater: '稍后更新'
+    updateLater: '稍后更新',
+    confirmResetPassword: '确认重置密码吗?'
   },
   title: {
     employeeInfo: '员工信息',
@@ -358,6 +370,7 @@ export default {
     lovView: '值集视图',
     lovColConfig: '值集列配置',
     sequenceInfo: '{name}单据序列配置',
-    userInfo: '用户信息'
+    userInfo: '用户信息',
+    layoutRole: '【{name}】角色列表'
   }
 };

package/src/plugins/vxe-table/render.tsx

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-01 09:18:50
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-05 18:23:19
+ * @LastEditTime: 2025-12-15 16:03:35
  * @Description: file content
  */
 
@@ -605,6 +605,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
     renderTableEdit(renderOpts: VxeColumnPropTypes.EditRender, params) {
       const { row, column } = params;
       const { props, events } = renderOpts;
+      debugger;
 
       /**
        * @description: 点击清空按钮时触发
@@ -629,6 +630,23 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
 
     // 可编辑显示模板
     renderTableCell(renderOpts, params) {
+      const { row, column } = params;
+      const { props } = renderOpts;
+      debugger;
+      return [
+        <form-upload2
+          record={row}
+          field={column.field}
+          size="mini"
+          {...props}
+          mode="image"
+          render-mode="column"
+          data-status="detail"
+        />
+      ];
+    },
+    // 默认显示模板
+    renderDefault(renderOpts, params) {
       const { row, column } = params;
       const { props } = renderOpts;
       return [