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

package/src/views/system/sysUser/SysUserPanel.vue

@@ -7,6 +7,7 @@
       :url="url"
       :auto-load="false"
       :default-params="defaultParams"
+      :buttons="buttons"
       mode="form"
       @buttonClick="onButtonClick"
     />
@@ -150,6 +151,8 @@ const loading = ref(false);
 const url = '/uums/user';
 let defaultPassword = '';
 
+const buttons = [{ code: 'resetPassword', status: 'warning', icon: 'ri-lock-line', auth: 'batch' }];
+
 const xgrid = ref(null);
 
 const formItems = [
@@ -266,15 +269,27 @@ const handleRole = async (row: any) => {
  * @return {*}
  */
 const handleResetPwd = async (row: Object) => {
+  const type = await VxeUI.modal.confirm(t(`message.tip.confirmResetPassword`));
+  if (type !== 'confirm') return;
   await serviceApi.put(url + '/resetPwd', row);
   await VxeUI.modal.alert(t('message.tip.initPassword', { code: defaultPassword }));
 };
-// 启用/禁用
-// const handleUpdate = async (record: IRecord) => {
-//   record.enabled = record.enabled === '1' ? '0' : '1';
-//   await serviceApi.put(url, record);
-//   getDataList();
-// };
+/**
+ * 批量重置密码
+ * @param record
+ */
+const handleBatch = async () => {
+  const selectRecords = xgrid.value.getSelectRecords();
+  if (!selectRecords.length) return;
+  const type = await VxeUI.modal.confirm(t(`message.tip.confirmResetPassword`));
+  if (type !== 'confirm') return;
+  const body = selectRecords.map(item => {
+    return { id: item.id };
+  });
+  await serviceApi.put(url + '/batchUpdatePwd', body);
+  await VxeUI.modal.alert(t('message.tip.initPassword', { code: defaultPassword }));
+  xgrid.value.refreshData();
+};
 /**
  * @description: 用户权限
  * @param {*} row 用户信息
@@ -320,6 +335,7 @@ const handleClose = () => {
 const onButtonClick = code => {
   code === 'add' && handleAdd();
   code === 'del' && handleDel();
+  code === 'resetPassword' && handleBatch();
 };
 
 const getUnitList = () => {

package/src/views/udev/dict/DictView.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:21
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-05 16:58:27
+ * @LastEditTime: 2025-12-29 14:23:32
  * @Description: 数据字典
 -->
 <template>
@@ -101,7 +101,7 @@ const handleClose = () => {
 
 const onGridEvents = {
   editActived({ row }) {
-    // columns[1].editRender.props.disabled = !!row.id;
+    columns[1].editRender.props.disabled = !!row.id;
   }
 };
 

package/src/views/udev/dict/childView.vue

@@ -79,6 +79,7 @@ const columns = [
   { field: 'dictCode', title: 'message.udp.dictCode', required: true, treeNode: true },
   { field: 'dictName', title: 'message.udp.dictName', required: true },
   { field: 'dictDesc', title: 'message.remark' },
+  { field: 'remarks', title: 'message.remark' },
   { field: 'enabled', formatter: ['formatDict', 'SU.ENABLE'] },
   {
     field: 'operate',

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

@@ -0,0 +1,32 @@
+<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-card :title="data.title" :height="data.height" shadow>
+          <component :is="data.component" />
+        </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';
+
+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();
+});
+</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-02 18:28:17
+ * @LastEditTime: 2025-12-26 13:51:06
  * @FilePath: /front-web-mes/src/views/uhome/su-welcome.vue
  * @Description: 欢迎页面
 -->
 <template>
   <div class="ut-home m-3">
     <!-- 顶部 -->
-    <div class="h-32 mb-4 p-4 flex justify-between items-center bg-white home-page">
+    <div v-if="!has2upversion" 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>
@@ -38,8 +38,10 @@
         <div class="mt-1 ml-3">{{ getLunarDay() }}</div>
       </div>
     </div>
-    <!-- 底部 -->
-    <el-row class="m-2" :gutter="10">
+    <el-row v-if="has2upversion">
+      <dynamic-card />
+    </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">
           <template #header>
@@ -142,6 +144,7 @@ import { useSystemStoreHook } from '../../store/modules/system';
 import { getServiceApi } from '../../api';
 import { kLOGINER } from '../../contant';
 import menuFavorite from './components/menu-favorite.vue';
+import dynamicCard from './dynamic-card.vue';
 
 defineOptions({ name: 'UdpWelcome' });
 
@@ -157,6 +160,8 @@ const firstName = computed(() => {
   return systemHook.getUserInfo.name?.slice(0, 1);
 });
 
+const has2upversion = ref(+window.__UDP_VERSION__.substring(0, 1) > 1);
+
 // 角色
 const getRole = () => {
   const isAdmin = systemHook.isAdminRole;
@@ -227,7 +232,7 @@ const onFavoriteMenu = () => {
 };
 
 onMounted(() => {
-  getMenuList();
+  !has2upversion.value && getMenuList();
   getUserLog();
 });
 

package/src/views/ulogin/login.vue

@@ -287,29 +287,40 @@ const insertLoginInfo = username => {
 };
 
 const getSysConfig = async () => {
-  const [err, data]: [Error, any] = await to(serviceApi.get('/upfm/v1/sysConfig', {}));
-  if (!err) {
-    const config: any = {};
-    data.list?.forEach(item => {
-      config[item.configCode] = item.configValue;
-      if (item.fileName) {
-        config[item.configCode] = getBaseURL() + '/ufil' + item.configValue;
-      }
-    });
-    const title = data.list?.find(f => f.configCode === 'title')?.configValue;
-    config['title'] = title || 'U-DP';
-    sysConfig.value = config;
-    bgStyle.value = {
-      backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : ``,
-      // backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : `url1(${welcome})`,
-      backgroundRepeat: 'no-repeat',
-      backgroundPosition: 'center'
-    };
-    console.log('bgStyle=', bgStyle);
-    const favicon = useFavicon();
-    favicon.value = config.favicon || utogether;
-    storageLocal.setItem(kSYSCONFIG, config);
-  }
+  // const [err, data]: [Error, any] = await to(serviceApi.get('/upfm/v1/sysConfig', {}));
+  // if (!err) {
+  //   const config: any = {};
+  //   data.list?.forEach(item => {
+  //     config[item.configCode] = item.configValue;
+  //     if (item.fileName) {
+  //       config[item.configCode] = getBaseURL() + '/ufil' + item.configValue;
+  //     }
+  //   });
+  //   const title = data.list?.find(f => f.configCode === 'title')?.configValue;
+  //   config['title'] = title || 'U-DP';
+  //   sysConfig.value = config;
+  //   bgStyle.value = {
+  //     backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : ``,
+  //     // backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : `url1(${welcome})`,
+  //     backgroundRepeat: 'no-repeat',
+  //     backgroundPosition: 'center'
+  //   };
+  //   console.log('bgStyle=', bgStyle);
+  //   const favicon = useFavicon();
+  //   favicon.value = config.favicon || utogether;
+  //   storageLocal.setItem(kSYSCONFIG, config);
+  // }
+
+  sysConfig.value = storageLocal.getItem(kSYSCONFIG);
+
+  bgStyle.value = {
+    backgroundImage: sysConfig.value['backgroundImg'] ? `url(${sysConfig.value['backgroundImg']})` : ``,
+    backgroundRepeat: 'no-repeat',
+    backgroundPosition: 'center'
+  };
+
+  const favicon = useFavicon();
+  favicon.value = sysConfig.value.favicon || utogether;
 };
 
 dataThemeChange(overallStyle.value);

package/types/global.d.ts

@@ -29,6 +29,7 @@ declare global {
   interface Window {
     // Global vue app
     __HISTORY_PATH__: string;
+    __UDP_VERSION__: string;
     __APP__: App<Element>;
     $i18n: () => void;
     webkitCancelAnimationFrame: (handle: number) => void;