@utogether/udp-core 2.0.0-beta.25 → 2.0.0-beta.27

package/src/views/uhome/components/home-todo.vue

@@ -1,178 +1,179 @@
-<!--
- * @Author: levi7754 levi7754@163.com
- * @Date: 2025-11-05 18:11:29
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-02-25 11:03:39
- * @FilePath: \udp-crm\packages\udp-crm\src\views\uflow\todo\flow-todo.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <div>
-    <vxe-tabs v-model="activeName" type="border-card" @tab-change="onTabChange">
-      <vxe-tab-pane name="todo" :title="$t('message.t_todoFlow')">
-        <div class="flex items-center w-full pl-2 pr-3 pt-1">
-          <vxe-input v-model="keywords" class="flex-1 w-full" placeholder="请输入任务编码或名称或标题查询" />
-          <div class="pl-1">
-            <ut-button content="search" icon="ri-search-line" @tap="onSearch" />
-            <ut-button content="reset" status="info" icon="ri-cycle-line" @tap="onReset" />
-          </div>
-        </div>
-        <ut-grid
-          ref="xgrid"
-          :columns="columns"
-          :data="data.todo"
-          :events="events"
-          :editable="false"
-          :need-export="false"
-          :proxy-config="{ enabled: false }"
-          :toolbar-config="{ enabled: false }"
-          height="360"
-        />
-      </vxe-tab-pane>
-      <vxe-tab-pane name="finish" lazy :title="$t('message.t_finishFlow')">
-        <div class="flex items-center w-full pl-2 pr-3 pt-1">
-          <vxe-input v-model="keywords" class="flex-1 w-full" placeholder="请输入任务编码或名称或标题查询" />
-          <div class="pl-1">
-            <ut-button content="search" icon="ri-search-line" @tap="onSearch" />
-            <ut-button content="reset" status="info" icon="ri-cycle-line" @tap="onReset" />
-          </div>
-        </div>
-        <ut-grid
-          ref="ygrid"
-          :columns="columns"
-          :data="data.finish"
-          :events="events"
-          :editable="false"
-          :need-export="false"
-          :proxy-config="{ enabled: false }"
-          :toolbar-config="{ enabled: false }"
-          height="360"
-        />
-        />
-      </vxe-tab-pane>
-    </vxe-tabs>
-    <vxe-modal v-model="showModal" :loading="loading" :title="flowTitle" height="360">
-      <vxe-image :src="imageUrl" :height="520" width="75%" />
-    </vxe-modal>
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { useRouter } from 'vue-router';
-import { ref, onMounted, nextTick } from 'vue';
-
-import { cookies } from '@utogether/utils';
-import { isEmpty } from 'xe-utils';
-import to from 'await-to-js';
-import { getServiceApi } from '../../../api';
-import { kLOGINER } from '../../../contant';
-const router = useRouter();
-
-const xgrid = ref(null);
-const ygrid = ref(null);
-const activeName = ref('todo');
-const showModal = ref(false);
-const loading = ref(false);
-const imageUrl = ref('');
-const keywords = ref(null);
-const flowTitle = ref(null);
-const data = ref({ todo: [], finish: [], todoPage: {}, finishPage: {} });
-
-const url = '/uwfl/activiti';
-
-const pagination = { pageNum: 1, pageSize: 20 };
-
-const columns = [
-  { field: 'taskId' },
-  { field: 'taskName' },
-  { field: 'taskTitle' },
-  { field: 'createDate' },
-  { field: 'createBy', title: 'message.creator' },
-  {
-    field: 'operate',
-    width: 90,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        return [
-          <>
-            <ut-button
-              visible={activeName.value === 'todo'}
-              content="todoTask"
-              icon="ri-send-plane-line"
-              onTap={() => handleTodo(row, 'edit')}
-            />
-            <ut-button
-              visible={activeName.value === 'finish'}
-              content="look"
-              status="info"
-              onTap={() => handleTodo(row)}
-            />
-          </>
-        ];
-      }
-    }
-  }
-];
-
-const events = {
-  pageChange({ pageSize, currentPage }) {
-    data.value[`${activeName.value}Page`] = { pageNum: currentPage, pageSize };
-    getDataList(activeName.value, keywords.value);
-  }
-};
-
-const onSearch = () => {
-  data.value[`${activeName.value}Page`] = pagination;
-  getDataList(activeName.value, keywords.value);
-};
-
-const onReset = () => {
-  keywords.value = null;
-  onSearch();
-};
-
-const getDataList = async (type, searchField) => {
-  console.log(type);
-  const uri = type === 'todo' ? '/listTasksToBeHandle' : '/listHandledTask';
-  const params = {
-    ...data.value[`${activeName.value}Page`],
-    searchField,
-    userName: cookies.get(kLOGINER)
-  };
-  const [err, res]: any = await to(getServiceApi().post(url + uri, params));
-  if (err) return;
-  data.value[type] = res.list;
-  data.value[type + 'Page'].total = res.total;
-
-  const grid = type === 'todo' ? xgrid : ygrid;
-  grid.value.getInstance().loadData(res.list);
-  grid.value.setPagerConfig({ ...data.value[type + 'Page'] });
-};
-
-const onTabChange = async ({ value }) => {
-  const grid = value === 'todo' ? xgrid : ygrid;
-  const operate = columns.find(f => f.field === 'operate');
-  operate.width = value === 'todo' ? 160 : 80;
-  await nextTick();
-  grid.value.getInstance().reloadColumn(columns);
-  const page = data.value[`${activeName.value}Page`];
-  data.value[`${activeName.value}Page`] = isEmpty(page) ? page : pagination;
-  getDataList(activeName.value, keywords.value);
-};
-
-const handleTodo = (row, dataStatus = 'detail') => {
-  console.log(row);
-  const data = Object.assign(
-    { dataStatus, workflowCode: row.sourceKey, businessKey: row.sourceId, processInstanceId: row.processInstId },
-    row
-  );
-  sessionStorage.setItem('kPROCESSKEY', JSON.stringify(data));
-  router.push({ name: 'FlowApproval' });
-};
-
-onMounted(() => {
-  data.value[`${activeName.value}Page`] = pagination;
-  getDataList('todo', null);
-});
-</script>
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-11-05 18:11:29
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-05-18 13:58:13
+ * @FilePath: \udp-crm\packages\udp-crm\src\views\uflow\todo\flow-todo.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div>
+    <vxe-tabs v-model="activeName" type="border-card" @tab-change="onTabChange">
+      <vxe-tab-pane name="todo" :title="$t('message.t_todoFlow')">
+        <div class="flex items-center w-full pl-2 pr-3 pt-1">
+          <vxe-input v-model="keywords" class="flex-1 w-full" placeholder="请输入任务编码或名称或标题查询" />
+          <div class="pl-1">
+            <ut-button content="search" icon="ri-search-line" @tap="onSearch" />
+            <ut-button content="reset" status="info" icon="ri-cycle-line" @tap="onReset" />
+          </div>
+        </div>
+        <ut-grid
+          ref="xgrid"
+          :columns="columns"
+          :data="data.todo"
+          :events="events"
+          :editable="false"
+          :need-export="false"
+          :proxy-config="{ enabled: false }"
+          :toolbar-config="{ enabled: false }"
+          height="360"
+        />
+      </vxe-tab-pane>
+      <vxe-tab-pane name="finish" lazy :title="$t('message.t_finishFlow')">
+        <div class="flex items-center w-full pl-2 pr-3 pt-1">
+          <vxe-input v-model="keywords" class="flex-1 w-full" placeholder="请输入任务编码或名称或标题查询" />
+          <div class="pl-1">
+            <ut-button content="search" icon="ri-search-line" @tap="onSearch" />
+            <ut-button content="reset" status="info" icon="ri-cycle-line" @tap="onReset" />
+          </div>
+        </div>
+        <ut-grid
+          ref="ygrid"
+          :columns="columns"
+          :data="data.finish"
+          :events="events"
+          :editable="false"
+          :need-export="false"
+          :proxy-config="{ enabled: false }"
+          :toolbar-config="{ enabled: false }"
+          height="360"
+        />
+        />
+      </vxe-tab-pane>
+    </vxe-tabs>
+    <vxe-modal v-model="showModal" :loading="loading" :title="flowTitle" height="360">
+      <vxe-image :src="imageUrl" :height="520" width="75%" />
+    </vxe-modal>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { useRouter } from 'vue-router';
+import { ref, onMounted, nextTick } from 'vue';
+
+import { cookies } from '@utogether/utils';
+import { isEmpty } from 'xe-utils';
+import to from 'await-to-js';
+import { getServiceApi } from '../../../api';
+import { kLOGINER } from '../../../contant';
+const router = useRouter();
+
+const xgrid = ref(null);
+const ygrid = ref(null);
+const activeName = ref('todo');
+const showModal = ref(false);
+const loading = ref(false);
+const imageUrl = ref('');
+const keywords = ref(null);
+const flowTitle = ref(null);
+const data = ref({ todo: [], finish: [], todoPage: {}, finishPage: {} });
+
+const url = '/uwfl/activiti';
+
+const pagination = { pageNum: 1, pageSize: 20 };
+
+const columns = [
+  { field: 'taskId' },
+  { field: 'taskName' },
+  { field: 'taskTitle' },
+  { field: 'createDate' },
+  { field: 'createBy', title: 'message.creator' },
+  {
+    field: 'operate',
+    width: 90,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        return [
+          <>
+            <ut-button
+              visible={activeName.value === 'todo'}
+              content="todoTask"
+              icon="ri-send-plane-line"
+              onTap={() => handleTodo(row, 'edit')}
+            />
+            <ut-button
+              visible={activeName.value === 'finish'}
+              content="look"
+              status="info"
+              onTap={() => handleTodo(row)}
+            />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+const events = {
+  pageChange({ pageSize, currentPage }) {
+    data.value[`${activeName.value}Page`] = { pageNum: currentPage, pageSize };
+    getDataList(activeName.value, keywords.value);
+  }
+};
+
+const onSearch = () => {
+  data.value[`${activeName.value}Page`] = pagination;
+  getDataList(activeName.value, keywords.value);
+};
+
+const onReset = () => {
+  keywords.value = null;
+  onSearch();
+};
+
+const getDataList = async (type, searchField) => {
+  console.log(type);
+  const uri = type === 'todo' ? '/listTasksToBeHandle' : '/listHandledTask';
+  const params = {
+    ...data.value[`${activeName.value}Page`],
+    searchField,
+    userName: cookies.get(kLOGINER)
+  };
+  const [err, res]: any = await to(getServiceApi().post(url + uri, params));
+  if (err) return;
+  data.value[type] = res.list;
+  data.value[type + 'Page'].total = res.total;
+
+  const grid = type === 'todo' ? xgrid : ygrid;
+  grid.value.getInstance().loadData(res.list);
+  grid.value.setPagerConfig({ ...data.value[type + 'Page'] });
+};
+
+const onTabChange = async ({ value }) => {
+  const grid = value === 'todo' ? xgrid : ygrid;
+  const operate = columns.find(f => f.field === 'operate');
+  operate.width = value === 'todo' ? 160 : 80;
+  await nextTick();
+  grid.value.getInstance().reloadColumn(columns);
+  const page = data.value[`${activeName.value}Page`];
+  data.value[`${activeName.value}Page`] = isEmpty(page) ? page : pagination;
+  getDataList(activeName.value, keywords.value);
+};
+
+const handleTodo = (row, dataStatus = 'detail') => {
+  console.log(row);
+  const { sourceKey, sourceId, processInstId } = row;
+  const data = Object.assign(
+    { dataStatus, workflowCode: sourceKey, businessKey: sourceId, processInstanceId: processInstId },
+    row
+  );
+  sessionStorage.setItem('kPROCESSKEY', JSON.stringify(data));
+  router.push({ name: 'FlowApproval' });
+};
+
+onMounted(() => {
+  data.value[`${activeName.value}Page`] = pagination;
+  getDataList('todo', null);
+});
+</script>

package/src/views/ulogin/login.vue

@@ -16,7 +16,7 @@
           :enter="{ opacity: 1, y: 0, transition: { delay: 200 } }"
         >
           <div class="icon">
-            <IconifyIconOffline :icon="UserFill" width="30" height="30" />
+            <i class="ri-user-fill ri-lg" />
           </div>
           <div>
             <i class="ri-logout-box-line" />
@@ -42,7 +42,7 @@
           }"
         >
           <div class="icon">
-            <IconifyIconOffline :icon="LockFill" width="30" height="30" />
+            <i class="ri-lock-fill ri-lg" />
           </div>
           <div>
             <h5>{{ $t('message.udp.password') }}</h5>
@@ -69,13 +69,13 @@
       </div>
     </div>
     <div v-if="sysConfig.techSupport === 'Y'" class="absolute flex justify-center w-full font-bold bottom-1">
-      <img :src="utogether" class="!h-10" style="height: 40px" />
+      <img :src="utogether" class="h-10!" style="height: 40px" />
       <span class="flex flex-row justify-center" style="width: 300px">
         <span style="font-size: 0; text-align: center">
           <a
             href="http://www.u-together.cn/"
             target="_blank"
-            class="!inline-block"
+            class="inline-block!"
             style="margin-bottom: -5px; font-size: 17px; color: #fff; mix-blend-mode: difference"
             :style="{ color: sysConfig.baseColor || '#FFF' }"
           >
@@ -84,7 +84,7 @@
           <a
             href="http://www.u-together.cn/"
             target="_blank"
-            class="!inline-block"
+            class="inline-block!"
             style="font-size: 12px; color: #fff; mix-blend-mode: difference"
             :style="{ color: sysConfig.baseColor || '#FFF' }"
           >
@@ -102,7 +102,7 @@ export default { name: 'LoginView' };
 </script>
 
 <script setup lang="ts">
-import { ref, reactive, onBeforeMount, onMounted } from 'vue';
+import { ref, reactive, onBeforeMount } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 // import io from 'socket.io-client';
@@ -115,16 +115,12 @@ import { useSystemStoreHook } from '../../store/modules/system';
 import { useLayout } from '../../layout/hooks/useLayout';
 import { useDataThemeChange } from '../../layout/hooks/useDataThemeChange';
 import { getBaseURL, getServiceApi } from '../../api';
-import { initDict, userMonitor } from '../../api/user';
+import { userMonitor } from '../../api/user';
 import { kTOKEN, kCKTOKEN, kLOGINER, kSYSCONFIG, kCRYPTO, kPASSWORD } from '../../contant';
 import { onLogined, onBeforeLogined } from '../../utils/lifecycle';
-// import bg from '../../assets/svg/bg.svg?component';
 import utogether from '../../assets/images/utogether.png';
 import welcome from '../../assets/images/welcome.png';
 
-import LockFill from '@iconify-icons/ri/lock-fill';
-import UserFill from '@iconify-icons/ri/user-3-fill';
-
 interface IContextProps {
   username: string;
   passWord: string;
@@ -212,7 +208,7 @@ const onLogin = async () => {
   cookies.set(kLOGINER, username);
 
   // initSocket(username);
-  await delay(200);
+  await delay(64);
   // 执行登录成功后的函数
   onLogined();
   router.push('/');
@@ -272,30 +268,6 @@ const cacheToken = token => {
 // };
 
 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);
-  // }
-
   sysConfig.value = storageLocal.getItem(kSYSCONFIG);
 
   bgStyle.value = {
@@ -310,13 +282,8 @@ const getSysConfig = async () => {
 
 dataThemeChange(overallStyle.value);
 
-onMounted(() => {
-  initDict().then(res => useSystemStoreHook().setDict(res));
-});
-
 onBeforeMount(() => {
   getSysConfig();
-  // cookies.addPrefix('sitzone-mes');
 });
 </script>
 

package/tsconfig.json

@@ -14,14 +14,13 @@
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
     "sourceMap": true,
-    "baseUrl": ".",
     "allowJs": false,
     "resolveJsonModule": true,
     "lib": ["dom", "esnext"],
     "incremental": true,
     "paths": {
-      "@/*": ["src/*"],
-      "@build/*": ["build/*"]
+      "@/*": ["./src/*"],
+      "@build/*": ["./build/*"]
     },
     "types": ["node", "vite/client", "element-plus/global", "jquery"]
   },