基础框架发布: 8.2.25

前端核心发布: 8.2.90
 1) 更新前端首页

io.sc.engine.rule.frontend/src/views/resources/StartDeployWorkflowDialog.vue

@@ -46,7 +46,11 @@ const resourceCodeRef = ref('');
 const resourceVersionRef = ref('');
 const resourceTargetStatusRef = ref('');
 
-const submit = (assignee) => {
+const submit = async (assignee) => {
+  const validated = await formRef.value.validate();
+  if (!validated) {
+    return;
+  }
   const data = formRef.value.getData();
   const variables = { targetStatus: resourceTargetStatusRef.value };
   const transientVariables = { task_treatment: data.treatment };

io.sc.platform.core.frontend/src/platform/i18n/messages.json

@@ -328,8 +328,20 @@
 
   "home.card.shortcutmenu.title": "My Commonly used Actions",
   "home.card.shortcutmenu.action.config": "Configure ...",
-  "home.card.task.title": "My Task",
-  "home.card.doneTask.title": "My Task Have been Done",
-  "home.card.finishTask.title": "My Task Have been Finished",
-  "home.card.message.chatDialog.title": "Chat with {sender}"
+
+  "home.card.task.title": "My Tasks",
+  "home.card.task.action.list": "all my tasks...",
+
+  "home.card.doneTask.title": "My Tasks Done",
+  "home.card.doneTask.action.list": "all my done tasks...",
+
+  "home.card.finishTask.title": "My Tasks Finished",
+  "home.card.finishTask.action.list": "all my finished tasks...",
+
+  "home.card.message.title": "My Messages",
+  "home.card.message.action.list": "all my messages...",
+  "home.card.message.chatDialog.title": "Chat with {sender}",
+
+  "home.card.announcement.title": "Announcements",
+  "home.card.announcement.action.list": "all announcements..."
 }

io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json

@@ -328,8 +328,20 @@
 
   "home.card.shortcutmenu.title": "我的常用功能",
   "home.card.shortcutmenu.action.config": "配置 ...",
+
   "home.card.task.title": "我的代辦",
+  "home.card.task.action.list": "顯示所有...",
+
   "home.card.doneTask.title": "我的已辦",
+  "home.card.doneTask.action.list": "顯示所有...",
+
   "home.card.finishTask.title": "我的辦結",
-  "home.card.message.chatDialog.title": "與 {sender} 的對話"
+  "home.card.finishTask.action.list": "顯示所有...",
+
+  "home.card.message.title": "我的消息",
+  "home.card.message.action.list": "顯示所有...",
+  "home.card.message.chatDialog.title": "與 {sender} 的對話",
+
+  "home.card.announcement.title": "系統公告",
+  "home.card.announcement.action.list": "顯示所有..."
 }

io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json

@@ -329,8 +329,20 @@
 
   "home.card.shortcutmenu.title": "我的常用功能",
   "home.card.shortcutmenu.action.config": "配置 ...",
+
   "home.card.task.title": "我的代办",
+  "home.card.task.action.list": "显示所有...",
+
   "home.card.doneTask.title": "我的已办",
+  "home.card.doneTask.action.list": "显示所有...",
+
   "home.card.finishTask.title": "我的办结",
-  "home.card.message.chatDialog.title": "与 {sender} 的对话"
+  "home.card.finishTask.action.list": "显示所有...",
+
+  "home.card.message.title": "我的消息",
+  "home.card.message.action.list": "显示所有...",
+  "home.card.message.chatDialog.title": "与 {sender} 的对话",
+
+  "home.card.announcement.title": "系统公告",
+  "home.card.announcement.action.list": "显示所有..."
 }

io.sc.platform.core.frontend/src/platform/plugin/axios.ts

@@ -32,10 +32,10 @@ const requestInterceptor = (config: any) => {
     if (AuthenticationManager.getLocalAccessToken()) {
       result.headers.Authorization = 'Bearer ' + AuthenticationManager.getLocalAccessToken();
     }
-  }
-
-  if (gc.axios?.basicAuth?.username && gc.axios?.basicAuth?.password) {
-    result.headers.Authorization = 'Basic ' + window.btoa(gc.axios.basicAuth.username + ':' + gc.axios.basicAuth.password);
+  } else {
+    if (gc.axios?.basicAuth?.username && gc.axios?.basicAuth?.password) {
+      result.headers.Authorization = 'Basic ' + window.btoa(gc.axios.basicAuth.username + ':' + gc.axios.basicAuth.password);
+    }
   }
 
   // 如果请求时传入 { loading: true } 属性, 则自动显示 "正在处理..., 请等待" 模态对话框

io.sc.platform.core.frontend/src/platform/plugin/environment/index.ts

@@ -207,6 +207,7 @@ class Environment {
    * @param args 执行参数
    */
   public static executeAction(name: string, args?: any): void {
+    console.log(Environment.getActions());
     const fun = Environment.getActions()[name];
     if (fun) {
       fun(args);

io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue

@@ -1,10 +1,15 @@
 <template>
   <q-card flat bordered>
-    <q-card-section class="text-orange px-2 py-1">
-      <div class="text-h6">{{ $t('systemAnnouncements') }}</div>
+    <q-card-section class="text-orange px-2 pt-1 pb-0">
+      <div class="row no-wrap items-center">
+        <q-icon name="bi-megaphone" size="1.3em" />
+        <span class="text-weight-bolder px-2">{{ $t('home.card.announcement.title') }}</span>
+        <q-space />
+        <q-btn size="12px" flat no-caps :label="$t('home.card.announcement.action.list')" />
+      </div>
     </q-card-section>
     <q-card-section class="p-0">
-      <q-markup-table flat dense separator="none" style="height: 150px; overflow-y: auto">
+      <q-markup-table flat dense separator="none" style="height: 130px; overflow-y: auto">
         <tbody>
           <tr v-for="item in unReadedAnnouncementsRef" :key="item.id" @click="handleTask(item)">
             <td width="100%">

io.sc.platform.core.frontend/src/platform/views/home/DoneTask.vue

@@ -1,10 +1,15 @@
 <template>
   <q-card flat bordered>
-    <q-card-section class="text-secondary px-2 py-1">
-      <div class="text-h6">{{ $t('home.card.doneTask.title') }}</div>
+    <q-card-section class="text-secondary px-2 pt-1 pb-0">
+      <div class="row no-wrap items-center">
+        <q-icon name="bi-list-check" size="1.5em" />
+        <span class="text-weight-bolder px-2">{{ $t('home.card.doneTask.title') }}</span>
+        <q-space />
+        <q-btn size="12px" flat no-caps :label="$t('home.card.doneTask.action.list')" />
+      </div>
     </q-card-section>
     <q-card-section class="p-0">
-      <q-markup-table flat dense separator="none" style="height: 150px; overflow-y: auto">
+      <q-markup-table flat dense separator="none" style="height: 130px; overflow-y: auto">
         <tbody>
           <tr v-for="item in unCompletedTasksRef" :key="item.id" @click="handleTask(item)">
             <td width="100%">

io.sc.platform.core.frontend/src/platform/views/home/FinishedTask.vue

@@ -1,10 +1,15 @@
 <template>
   <q-card flat bordered>
-    <q-card-section class="text-info px-2 py-1">
-      <div class="text-h6">{{ $t('home.card.finishTask.title') }}</div>
+    <q-card-section class="text-info px-2 pt-1 pb-0">
+      <div class="row no-wrap items-center">
+        <q-icon name="bi-card-list" size="1.5em" />
+        <span class="text-weight-bolder px-2">{{ $t('home.card.finishTask.title') }}</span>
+        <q-space />
+        <q-btn size="12px" flat no-caps :label="$t('home.card.finishTask.action.list')" />
+      </div>
     </q-card-section>
     <q-card-section class="p-0">
-      <q-markup-table flat dense separator="none" style="height: 150px; overflow-y: auto">
+      <q-markup-table flat dense separator="none" style="height: 130px; overflow-y: auto">
         <tbody>
           <tr v-for="item in unCompletedTasksRef" :key="item.id" @click="handleTask(item)">
             <td width="100%">

io.sc.platform.core.frontend/src/platform/views/home/Message.vue

@@ -1,10 +1,15 @@
 <template>
   <q-card flat bordered>
-    <q-card-section class="text-positive px-2 py-1">
-      <div class="text-h6">{{ $t('myMessages') }}</div>
+    <q-card-section class="text-positive px-2 pt-1 pb-0">
+      <div class="row no-wrap items-center">
+        <q-icon name="bi-chat-text" size="1.5em" />
+        <span class="text-weight-bolder px-2">{{ $t('home.card.message.title') }}</span>
+        <q-space />
+        <q-btn size="12px" flat no-caps :label="$t('home.card.message.action.list')" />
+      </div>
     </q-card-section>
     <q-card-section class="p-0">
-      <q-markup-table flat dense separator="none" style="width: 100%; height: 150px; overflow-y: auto">
+      <q-markup-table flat dense separator="none" style="width: 100%; height: 130px; overflow-y: auto">
         <tbody>
           <tr v-for="item in unReadedNotificationsRef" :key="item.id">
             <td width="100%">

io.sc.platform.core.frontend/src/platform/views/home/ShortcutMenu.vue

@@ -1,7 +1,12 @@
 <template>
   <q-card flat bordered>
-    <q-card-section class="text-secondary px-2 py-1">
-      <div class="text-h6">{{ $t('home.card.shortcutmenu.title') }}</div>
+    <q-card-section class="text-secondary px-2 pt-1 pb-0">
+      <div class="row no-wrap items-center">
+        <q-icon name="bi-cursor" size="1.5em" />
+        <span class="text-weight-bolder px-2">{{ $t('home.card.shortcutmenu.title') }}</span>
+        <q-space />
+        <q-btn size="12px" flat no-caps :label="$t('home.card.shortcutmenu.action.config')" :to="{ name: 'route.system.settings' }" />
+      </div>
     </q-card-section>
     <q-card-section class="p-2">
       <div class="row">
@@ -13,7 +18,6 @@
                 <div>{{ item.shortcutMenuName }}</div>
               </q-btn>
             </template>
-            <q-btn icon="bi-gear" :label="$t('home.card.shortcutmenu.action.config')" stack color="primary" :to="{ name: 'route.system.settings' }" />
           </div>
         </div>
       </div>

io.sc.platform.core.frontend/src/platform/views/home/Task.vue

@@ -1,10 +1,15 @@
 <template>
   <q-card flat bordered>
-    <q-card-section class="text-warning px-2 py-1">
-      <div class="text-h6">{{ $t('home.card.task.title') }}</div>
+    <q-card-section class="text-warning px-2 pt-1 pb-0">
+      <div class="row no-wrap items-center">
+        <q-icon name="bi-list-ol" size="1.5em" />
+        <span class="text-weight-bolder px-2">{{ $t('home.card.task.title') }}</span>
+        <q-space />
+        <q-btn size="12px" flat no-caps :label="$t('home.card.task.action.list')" />
+      </div>
     </q-card-section>
     <q-card-section class="p-0">
-      <q-markup-table flat dense separator="none" style="width: 100%; height: 150px; overflow-y: auto">
+      <q-markup-table flat dense separator="none" style="width: 100%; height: 130px; overflow-y: auto">
         <tbody>
           <tr v-for="item in unCompletedTasksRef" :key="item.id">
             <td width="100%">