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

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

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2024-06-05 14:32:03
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-10-30 08:54:16
+ * @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
  */
@@ -10,8 +10,8 @@ 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 { VxetableRender } from '@utogether/utils';
+// import { VxetableRender } from './render';
 import { getServiceApi } from '../../api';
 
 import VXETable, { VxeUI } from 'vxe-table';

package/src/router/index.ts

@@ -10,6 +10,7 @@ import { kLOGINER } from '../contant';
 import homeRouter from './modules/home';
 import errorRouter from './modules/error';
 import remainingRouter from './modules/remaining';
+import flow from './modules/flow';
 
 const systemRouter = import.meta.glob([
   '../views/system/**/*.{vue,tsx}',
@@ -19,12 +20,13 @@ const systemRouter = import.meta.glob([
   '../views/urpt/**/*.{vue,tsx}',
   '../views/organization/**/*.{vue,tsx}',
   '../views/udev/**/*.{vue, tsx}'
+  // '../views/uflow/**/*.{vue, tsx}'
 ]);
 
 export const remainingRouters = remainingRouter;
 
 // 原始静态路由（未做任何处理）
-const routes = [homeRouter, errorRouter];
+const routes = [homeRouter, errorRouter, flow];
 /** 导出处理后的静态路由（三级及以上的路由全部拍成二级） */
 export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
   formatFlatteningRoutes(buildHierarchyTree(ascending(routes)))

package/src/router/modules/flow.ts

@@ -0,0 +1,35 @@
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2023-10-10 11:31:53
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-05 19:17:32
+ * @FilePath: /sitzone-mes/src/router/modules/tabs.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+const Layout = () => import('../../layout/layoutView.vue');
+
+const tabsRouter: RouteConfigsTable = {
+  component: Layout,
+  path: '/utask',
+  redirect: '/utask/task/flow-task',
+  meta: {
+    showLink: false,
+    icon: 'IF-pure-iconfont-tabs',
+    title: 'message.udp.flowTask'
+  },
+  children: [
+    // query 传参模式
+    {
+      path: '/utask/task/flow-task',
+      name: 'FlowTask',
+      component: () => import('../../views/utask/flow-task.vue'),
+      meta: {
+        // 不在menu菜单中显示
+        title: '',
+        showLink: false,
+        activePath: '/uflow/index'
+      }
+    }
+  ]
+};
+export default tabsRouter;

package/src/router/utils.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2024-08-01 21:42:39
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-10 09:22:45
+ * @FilePath: \udp-front\packages\udp-core\src\router\utils.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import type { RouteRecordRaw, RouteComponent } from 'vue-router';
 import { isProxy, toRaw, defineAsyncComponent } from 'vue';
 import { useTimeoutFn } from '@vueuse/core';
@@ -273,6 +281,9 @@ const menuI18n = {
   zh: {},
   en: {}
 };
+
+const processMenus = [];
+
 const addAsyncRoutes = (arrRoutes: Array<any>) => {
   const modulesRoutes = getViews();
 
@@ -286,7 +297,17 @@ const addAsyncRoutes = (arrRoutes: Array<any>) => {
       v.redirect = v.children[0].path;
     }
     const { icon, permissionCode, extraIcon, frameSrc } = v;
-    v.meta = { keepAlive: true, rank: v.sort, title: `${v.i18nField}` };
+    // 流程菜单保存
+    v.isFlowMenu && processMenus.push(v);
+
+    v.meta = {
+      keepAlive: true,
+      rank: v.sort,
+      title: `${v.i18nField}`,
+      // 审批流设计页面和审批页面的code写死，只需配置页面即可(保底方式)
+      showLink: !['UdpFlowDesign', 'UDPFlowTask'].includes(v.menuCode) ? null : false
+    };
+    v.hiddenTag = null;
     Object.assign(v.meta, { icon, permissionCode, extraIcon, frameSrc });
     menuI18n.zh[v.i18nField] = v.menuName || v.menuNameEn;
     menuI18n.en[v.i18nField] = v.menuNameEn || v.menuName;
@@ -377,11 +398,16 @@ function getTopMenu(tag = false) {
   return topMenu;
 }
 
+function getProcessMenu() {
+  return processMenus;
+}
+
 export {
   ascending,
   filterTree,
   initRouter,
   getTopMenu,
+  getProcessMenu,
   hasPermissions,
   addAsyncRoutes,
   getParentPaths,

package/src/store/modules/multiTags.ts

@@ -2,11 +2,11 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-10-19 12:01:05
+ * @LastEditTime: 2025-11-06 17:48:20
  * @Description: file content
  */
 import { defineStore } from 'pinia';
-import { isEqual, isBoolean } from 'xe-utils';
+import { isEqual } from 'xe-utils';
 import { storageLocal, isUrl } from '@utogether/utils';
 import { store } from '../index';
 import { routerArrays } from '../../layout/types';
@@ -54,8 +54,8 @@ export const useMultiTagsStore = defineStore('udp-multiTags', {
             if (isUrl(tagVal?.name)) return;
             // 如果title为空拒绝添加空信息到标签页
             if (tagVal?.meta?.title?.length === 0) return;
-            // showLink:false 不添加到标签页
-            if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
+            // showLink:false 不添加到标签页 -- 因审批流注释2025/11/6
+            // if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
             const tagPath = tagVal.path;
             // 判断tag是否已存在
             const tagHasExits = this.multiTags.some(tag => {

package/src/views/udev/coderule/code-rule.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-15 17:45:07
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-10-30 13:18:33
+ * @LastEditTime: 2025-11-10 10:21:07
  * @Description: 编码规则
 -->
 <template>
@@ -114,7 +114,7 @@ const handleEdit = row => {
 // 启用/禁用
 async function handleClick({ row }) {
   console.log(row);
-  const [err] = await to(getServiceApi().put(url, row));
+  const [err] = await to(getServiceApi().put(url, [row]));
   !err && xgrid.value.refreshData();
 }
 </script>

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

@@ -1,180 +1,174 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-07-15 17:02:56
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 11:22:03
- * @Description: file contentu
--->
-<template>
-  <div class="ut-loview-wrapper">
-    <el-drawer
-      :model-value="show"
-      :with-header="false"
-      :show-close="false"
-      :close-on-click-modal="false"
-      size="90%"
-    >
-      <div v-spinning="loading">
-        <ut-content :title="$t('message.title.lovView')" @close="handleClose">
-          <template v-slot:header>
-            <ut-button icon="ri-save-3-fill" content="save" @tap="handleSave()" />
-          </template>
-          <template v-slot:body>
-            <ut-form ref="formRef" :record="record" :items="items" data-status="update" />
-            <ut-divider :title="$t('message.title.lovColConfig')" />
-            <ut-grid
-              ref="xgrid"
-              :columns="columns"
-              :url="subUrl"
-              :default-value="{ headerId: record.id }"
-              :default-params="{ headerId: record.id }"
-              :height="height"
-              :events="onEvents"
-            />
-          </template>
-        </ut-content>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import to from 'await-to-js';
-import { useRender } from '@utogether/utils';
-import { useSystemStoreHook } from '../../../store/modules/system';
-import { getServiceApi } from '../../../api';
-
-interface IProps {
-  record: IRecord;
-  show: boolean;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  record: (): IRecord => {
-    return {};
-  },
-  show: false
-});
-
-const renderHook = useRender();
-const dictData = useSystemStoreHook().dicts;
-const loading = ref(false);
-const optionProps = { value: 'dictCode', label: 'dictName' };
-
-const formRef = ref(null);
-
-const url = '/upfm/v1/lovViewHeader';
-const subUrl = '/upfm/v1/lovViewLine';
-
-const items = [
-  { field: 'lovCode', disabled: true },
-  { field: 'lovName', required: true },
-  { field: 'valueField', required: true },
-  // { field: 'displayField', required: true },
-  { field: 'lovTitle' },
-  { field: 'lovType', code: 'SU.LOV.TYPE', required: true },
-  { field: 'lovUrl', required: true, visible: props.record.lovType === 'url' },
-  {
-    field: 'sqlStatement',
-    span: 24,
-    visible: props.record.lovType === 'sql',
-    itemRender: { name: '$textarea', props: { rows: 5 } },
-    required: true
-  }
-];
-
-// 列字段
-const columns: ITableColProps[] = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber() },
-  { field: 'colField', required: true, editRender: renderHook.renderInput() },
-  { field: 'colTitle', required: true, editRender: renderHook.renderInput() },
-  { field: 'colWidth', required: true, width: 120, editRender: renderHook.renderNumber() },
-  {
-    field: 'fieldType',
-    width: 120,
-    editRender: renderHook.renderDict('SU.FIELD.TYPE', onChange),
-    formatter: ['formatDict', 'SU.FIELD.TYPE']
-  },
-  {
-    field: 'dictCode',
-    title: 'message.dictName',
-    width: 120,
-    editRender: renderHook.renderSelectLocal({ options: dictData, optionProps }),
-    formatter: ['formatSelectLocal', [dictData, 'dictCode', 'dictName']]
-  },
-  {
-    field: 'isSearch',
-    width: 120,
-    required: true,
-    editRender: renderHook.renderDict('SU.WHETHER'),
-    formatter: ['formatDict', 'SU.WHETHER']
-  },
-  {
-    field: 'isCol',
-    width: 120,
-    required: true,
-    editRender: renderHook.renderDict('SU.WHETHER'),
-    formatter: ['formatDict', 'SU.WHETHER']
-  }
-];
-
-const xgrid = ref(null);
-const height = window.innerHeight - 300;
-
-//激活事件
-const onEvents = {
-  editActived({ row }) {
-    columns[6].editRender.props.disabled = row.fieldType !== 'dictCode';
-  }
-};
-
-// change事件
-function onChange(item) {
-  item.row.dictName = '';
-  columns[6].editRender.props.disabled = item.row.fieldType !== 'dictCode';
-  columns[6].required = item.row.fieldType !== 'dictCode';
-}
-
-/**
- * @description: 保存值集视图
- * @return {*}
- */
-const handleSave = () => {
-  formRef.value.validateForm(async valid => {
-    if (!valid) {
-      loading.value = true;
-      const [err] = await to(getServiceApi().put(url, [props.record]));
-      if (!err) {
-        const data = xgrid.value.getInstance().getRecordset();
-        data.insertRecords.length && (await to(getServiceApi().post(subUrl, data.insertRecords)));
-        data.updateRecords.length && (await to(getServiceApi().put(subUrl, data.updateRecords)));
-      }
-      loading.value = false;
-    }
-  });
-};
-
-const emit = defineEmits<{ (e: 'onClose'): void }>();
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-</script>
-
-<style lang="scss">
-.ut-loview-wrapper {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-
-  .el-drawer__body {
-    padding: 5px 0;
-  }
-
-  .ut-content-body {
-    height: 90%;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-07-15 17:02:56
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-29 11:22:03
+ * @Description: file contentu
+-->
+<template>
+  <div class="ut-loview-wrapper">
+    <el-drawer :model-value="show" :with-header="false" :show-close="false" :close-on-click-modal="false" size="90%">
+      <div v-spinning="loading">
+        <ut-content :title="$t('message.title.lovView')" @close="handleClose">
+          <template v-slot:header>
+            <ut-button icon="ri-save-3-fill" content="save" @tap="handleSave()" />
+          </template>
+          <template v-slot:body>
+            <ut-form ref="formRef" :record="record" :items="items" data-status="update" />
+            <ut-divider :title="$t('message.title.lovColConfig')" />
+            <ut-grid
+              ref="xgrid"
+              :columns="columns"
+              :url="subUrl"
+              :default-value="{ headerId: record.id }"
+              :default-params="{ headerId: record.id }"
+              :height="height"
+              :events="onEvents"
+            />
+          </template>
+        </ut-content>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import to from 'await-to-js';
+import { useRender } from '@utogether/utils';
+import { useSystemStoreHook } from '../../../store/modules/system';
+import { getServiceApi } from '../../../api';
+
+interface IProps {
+  record: IRecord;
+  show: boolean;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  show: false
+});
+
+const renderHook = useRender();
+const dictData = useSystemStoreHook().dicts;
+const loading = ref(false);
+const optionProps = { value: 'dictCode', label: 'dictName' };
+
+const formRef = ref(null);
+
+const url = '/upfm/v1/lovViewHeader';
+const subUrl = '/upfm/v1/lovViewLine';
+
+const items = [
+  { field: 'lovCode', disabled: true },
+  { field: 'lovName', required: true },
+  { field: 'valueField', required: true },
+  // { field: 'displayField', required: true },
+  { field: 'lovTitle' },
+  { field: 'lovType', code: 'SU.LOV.TYPE', required: true },
+  { field: 'lovUrl', required: true, visible: props.record.lovType === 'url' },
+  {
+    field: 'sqlStatement',
+    span: 24,
+    visible: props.record.lovType === 'sql',
+    itemRender: { name: '$textarea', props: { rows: 5 } },
+    required: true
+  }
+];
+
+// 列字段
+const columns: ITableColProps[] = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber() },
+  { field: 'colField', required: true, editRender: renderHook.renderInput() },
+  { field: 'colTitle', required: true, editRender: renderHook.renderInput() },
+  { field: 'colWidth', required: true, width: 120, editRender: renderHook.renderNumber() },
+  {
+    field: 'fieldType',
+    width: 120,
+    editRender: renderHook.renderDict('SU.FIELD.TYPE', onChange),
+    formatter: ['formatDict', 'SU.FIELD.TYPE']
+  },
+  {
+    field: 'dictCode',
+    title: 'message.dictName',
+    width: 120,
+    editRender: renderHook.renderSelectLocal({ options: dictData, optionProps }),
+    formatter: ['formatSelectLocal', [dictData, 'dictCode', 'dictName']]
+  },
+  {
+    field: 'isSearch',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderDict('SU.WHETHER'),
+    formatter: ['formatDict', 'SU.WHETHER']
+  },
+  {
+    field: 'isCol',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderDict('SU.WHETHER'),
+    formatter: ['formatDict', 'SU.WHETHER']
+  }
+];
+
+const xgrid = ref(null);
+const height = window.innerHeight - 300;
+
+//激活事件
+const onEvents = {
+  editActived({ row }) {
+    columns[6].editRender.props.disabled = row.fieldType !== 'dictCode';
+  }
+};
+
+// change事件
+function onChange(item) {
+  item.row.dictName = '';
+  columns[6].editRender.props.disabled = item.row.fieldType !== 'dictCode';
+  columns[6].required = item.row.fieldType !== 'dictCode';
+}
+
+/**
+ * @description: 保存值集视图
+ * @return {*}
+ */
+const handleSave = () => {
+  formRef.value.validateForm(async valid => {
+    if (!valid) {
+      loading.value = true;
+      const [err] = await to(getServiceApi().put(url, [props.record]));
+      if (!err) {
+        const data = xgrid.value.getInstance().getRecordset();
+        data.insertRecords.length && (await to(getServiceApi().post(subUrl, data.insertRecords)));
+        data.updateRecords.length && (await to(getServiceApi().put(subUrl, data.updateRecords)));
+      }
+      loading.value = false;
+    }
+  });
+};
+
+const emit = defineEmits<{ (e: 'onClose'): void }>();
+// 抽屉关闭
+function handleClose() {
+  emit('onClose');
+}
+</script>
+
+<style lang="scss">
+.ut-loview-wrapper {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
+
+  .el-drawer__body {
+    padding: 5px 0;
+  }
+
+  .ut-content-body {
+    height: 90%;
+  }
+}
+</style>

package/src/views/utask/flow-task.vue

@@ -0,0 +1,18 @@
+<script lang="ts">
+export default { name: 'FlowTask' };
+</script>
+
+<script setup lang="ts">
+// import { useDetail } from './hooks';
+
+// const { initToDetail, getParameter } = useDetail();
+// initToDetail('query');
+</script>
+
+<template>
+  <div>
+    <!-- {{ getParameter.id }} - 详情页内容在此（query传参）
+    <p>当前页面参数为：{{ getParameter }}</p> -->
+    dhasdhkasd kasdAsdasjldj打死了电话卡手机号多久啊是的
+  </div>
+</template>