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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@utogether/udp-core",
   "private": false,
-  "version": "1.0.4-beta.3",
+  "version": "2.0.0-beta.1",
   "description": "",
   "type": "module",
   "main1": "index.ts",

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,10 +26,6 @@ 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 {
@@ -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);

package/src/plugins/i18n/zh.ts

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

package/src/views/system/layout/layout-home.vue

@@ -0,0 +1,199 @@
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-12-23 11:00:51
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-26 19:10:01
+ * @FilePath: \udp-crm\packages\udp-crm\src\views\udev\layout\home-layout.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="items" :columns="columns" :url="url" />
+    <!-- 角色分配 -->
+    <ut-modal-grid
+      v-if="showModal"
+      ref="ygrid"
+      :columns="subColumns"
+      mode="form"
+      :url="url + '/detail'"
+      :title="$t('message.title.layoutRole', { name: data.title })"
+      width="50%"
+      @buttonClick="onButtonClick"
+    />
+    <!-- 角色列表 -->
+    <ut-modal-grid
+      v-if="showRole"
+      ref="xmodal"
+      :items="subItems"
+      :columns="subColumns"
+      :show-footer="true"
+      :editable="false"
+      :title="$t('message.udp.roleList')"
+      url="/uums/role"
+      width="60%"
+      height="75%"
+      @close="showRole = false"
+      @confirm="onConfirm"
+    />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref } from 'vue';
+import { useRender, successMessage, warnMessage } from '@utogether/utils';
+import { to } from 'await-to-js';
+import { clone } from 'xe-utils';
+import { VxeUI } from 'vxe-pc-ui';
+import { useI18n } from 'vue-i18n';
+import { getServiceApi } from '../../../api';
+
+defineOptions({ name: 'HomeLayout' });
+
+const renderHook = useRender();
+const { t } = useI18n();
+
+const xgrid = ref(null);
+const ygrid = ref(null);
+const xmodal = ref(null);
+
+const showModal = ref(false);
+const showRole = ref(false);
+
+const data = ref<IRecord>({});
+
+const url = '/ucrm/sysHomeConfig';
+
+const items = [
+  { field: 'code', title: 'message.udp.componentCode' },
+  { field: 'title', title: 'message.udp.componentTitle' }
+];
+
+const subItems = [
+  { field: 'roleName', span: 9, title: 'message.udp.roleName' },
+  { field: 'roleCode', span: 9, title: 'message.udp.roleCode' }
+];
+
+const options = [
+  { label: 3, value: 3 },
+  { label: 4, value: 4 },
+  { label: 6, value: 6 },
+  { label: 8, value: 8 },
+  { label: 12, value: 12 },
+  { label: 24, value: 24 }
+];
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber({ min: 10, step: 10 }) },
+  {
+    field: 'code',
+    title: 'message.udp.componentCode',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'title',
+    title: 'message.udp.componentTitle',
+    minWidth: 150,
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'span',
+    title: 'message.udp.componentSpan',
+    required: true,
+    width: 160,
+    editRender: renderHook.renderSelectLocal({ options })
+  },
+  {
+    field: 'height',
+    title: 'message.udp.componentHeight',
+    required: true,
+    editRender: renderHook.renderNumber({ min: 300 })
+  },
+  {
+    field: 'url',
+    title: 'message.udp.componentPath',
+    required: true,
+    minWidth: 150,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'enabled', width: 90, formatter: ['formatDict', 'SU.ENABLE'] },
+  {
+    field: 'operate',
+    width: 140,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return;
+        const enabled = {
+          conent: row.enabled === '1' ? 'disabled' : 'enable',
+          status: row.enabled === '1' ? 'warning' : 'success',
+          icon: row.enabled === '1' ? 'ri-pause-circle-line' : 'ri-play-circle-line'
+        };
+        return [
+          <>
+            <ut-button content="role" auth="role" icon="ri-user-line" onTap={() => handleRole(row)} />
+            <ut-button content={enabled.conent} {...enabled} onTap={() => handleRowStatus(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+const subColumns = [
+  { type: 'checkbox', width: 40 },
+  { field: 'roleName', title: 'message.udp.roleName' },
+  { field: 'roleCode', title: 'message.udp.roleCode' }
+];
+
+const handleRole = row => {
+  data.value = row;
+  showModal.value = true;
+};
+
+const handleAdd = () => {
+  showRole.value = true;
+};
+
+const handleRowStatus = async row => {
+  const message = row.enabled === '1' ? 'tip_disabledrecord' : 'tip_enabledrecord';
+  const type = await VxeUI.modal.confirm(t(`message.${message}`));
+  if (type === 'confirm') {
+    const body = clone(row, true);
+    body.enabled = body.enabled === '1' ? '0' : '1';
+    const [err] = await to(getServiceApi().put(url, [body]));
+    if (err) return;
+    successMessage();
+    xgrid.value.refreshData();
+  }
+};
+
+const handleDel = () => {
+  const selectRecords = ygrid.value.getSelectRecords();
+  if (!selectRecords.length) return;
+  ygrid.value.getInstance().commitProxy('delete');
+};
+
+const onConfirm = async records => {
+  if (records.length === 0) return warnMessage('message.tip.selectRole');
+  records.forEach(m => {
+    m.systemConfigId = data.value.id;
+  });
+  xmodal.value.showLoading();
+  const [err] = await to(getServiceApi().post(url + '/detail', records));
+  if (!err) {
+    successMessage();
+    ygrid.value.refreshData();
+    showRole.value = false;
+  }
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+</script>

package/src/views/system/menu/AuthorityPanel.vue

@@ -83,7 +83,6 @@ const columns = [
   {
     field: 'remark',
     title: 'message.udp.description',
-    required: true,
     editRender: renderHook.renderInput()
   },
   {

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/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;