Merge branch 'master' of https://a.leanwo.com:3000/prodog-client-2023/client-base-v4

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.78",
+  "version": "4.0.79",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",
@@ -20,7 +20,7 @@
     "click-outside-vue3": "^4.0.1",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.10.3",
-    "pc-component-v3": "1.0.87-t2",
+    "pc-component-v3": "1.0.87-t3",
     "uuid": "^8.3.2",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-request": "^1.2.4",

src/client/MenuWidget.vue

@@ -373,7 +373,7 @@ export default {
 
 <style>
 .menu-side {
-  background-color: var(--menu-side-background-color);
+  background-color: var(--menu-side-background-color) !important;
   position: fixed;
   top: 0px;
   bottom: 0;

src/window1/tabGridView/NewTabButton.vue

@@ -3,36 +3,66 @@
     <div v-if="leftTabButton.length === 0" />
     <a-breadcrumb v-if="leftTabButton && leftTabButton.length" separator="|">
       <a-breadcrumb-item v-for="(item, index) in leftTabButton" :key="index">
-        <PlusSquareTwoTone v-if="item.action === 'CREATE'" />
-        <EditTwoTone v-if="item.action === 'EDIT'" />
-        <DeleteTwoTone v-if="item.action === 'DELETE'" />
-        <ControlTwoTone v-if="item.action === 'RUN_PROCESS_REPORT'" />
-        <BookTwoTone v-if="item.action === 'OPEN_CUSTOMER_WINDOW'" />
-        <ContainerTwoTone v-if="item.action === 'OPEN_HTML_WINDOW'" />
-        <FileTextTwoTone v-if="item.action === 'EXPORT'" />
-        <ReloadOutlined v-if="item.action === 'REFRESH'" />
-        <BellTwoTone v-if="item.action === 'NOTICE'" />
-        <HddOutlined
-          v-if="item.action === 'OPEN_REMOTE_COMPONENT_MODULE_IN_MODAL'"
-        />
-
-        <span v-if="item.action === 'CREATE'" @click="create">{{
-          item.name
-        }}</span>
-        <span v-else-if="item.action === 'DELETE'" @click="deleteData">{{
-          item.name
-        }}</span>
-        <span v-else-if="item.action === 'EXPORT'" @click="exportConfirm">{{
-          item.name
-        }}</span>
-        <span v-else-if="item.action === 'REFRESH'" @click="refresh">{{
-          item.name
-        }}</span>
-        <span
+        <a-button
+          v-if="item.action === 'CREATE'"
+          :icon="h(PlusSquareTwoTone)"
+          @click="create"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button v-else-if="item.action === 'EDIT'" :icon="h(EditTwoTone)">
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'DELETE'"
+          :icon="h(DeleteTwoTone)"
+          @click="deleteData"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'RUN_PROCESS_REPORT'"
+          :icon="h(ControlTwoTone)"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'OPEN_CUSTOMER_WINDOW'"
+          :icon="h(BookTwoTone)"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'OPEN_HTML_WINDOW'"
+          :icon="h(ContainerTwoTone)"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'EXPORT'"
+          :icon="h(FileTextTwoTone)"
+          @click="exportConfirm"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'REFRESH'"
+          :icon="h(ReloadOutlined)"
+          @click="refresh"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button v-else-if="item.action === 'NOTICE'" :icon="h(BellTwoTone)">
+          {{ item.name }}
+        </a-button>
+        <a-button
           v-else-if="item.action === 'OPEN_REMOTE_COMPONENT_MODULE_IN_MODAL'"
+          :icon="h(HddOutlined)"
           @click="openRemoteComponentModule(item)"
-        >{{ item.name }}</span>
-        <span v-else>{{ item.name }}</span>
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
       </a-breadcrumb-item>
 
       <!-- <a-breadcrumb-item>
@@ -46,39 +76,66 @@
     </a-breadcrumb>
     <a-breadcrumb separator="|">
       <a-breadcrumb-item v-for="(item, index) in rightTabButton" :key="index">
-        <PlusSquareTwoTone v-if="item.action === 'CREATE'" />
-        <EditTwoTone v-if="item.action === 'EDIT'" />
-        <DeleteTwoTone v-if="item.action === 'DELETE'" />
-        <ControlTwoTone v-if="item.action === 'RUN_PROCESS_REPORT'" />
-        <BookTwoTone v-if="item.action === 'OPEN_CUSTOMER_WINDOW'" />
-        <ContainerTwoTone v-if="item.action === 'OPEN_HTML_WINDOW'" />
-        <FileTextTwoTone v-if="item.action === 'EXPORT'" />
-        <BellTwoTone v-if="item.action === 'NOTICE'" />
-        <ReloadOutlined v-if="item.action === 'REFRESH'" />
-        <HddOutlined
-          v-if="item.action === 'OPEN_REMOTE_COMPONENT_MODULE_IN_MODAL'"
-        />
-        <span v-if="item.action === 'CREATE'" @click="create">{{
-          item.name
-        }}</span>
-        <span v-else-if="item.action === 'DELETE'" @click="deleteData">{{
-          item.name
-        }}</span>
-        <span v-else-if="item.action === 'EXPORT'" @click="exportConfirm">{{
-          item.name
-        }}</span>
-        <span v-else-if="item.action === 'REFRESH'" @click="refresh">{{
-          item.name
-        }}</span>
-        <span
+        <a-button
+          v-if="item.action === 'CREATE'"
+          :icon="h(PlusSquareTwoTone)"
+          @click="create"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button v-else-if="item.action === 'EDIT'" :icon="h(EditTwoTone)">
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'DELETE'"
+          :icon="h(DeleteTwoTone)"
+          @click="deleteData"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'RUN_PROCESS_REPORT'"
+          :icon="h(ControlTwoTone)"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'OPEN_CUSTOMER_WINDOW'"
+          :icon="h(BookTwoTone)"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'OPEN_HTML_WINDOW'"
+          :icon="h(ContainerTwoTone)"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'EXPORT'"
+          :icon="h(FileTextTwoTone)"
+          @click="exportConfirm"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button
+          v-else-if="item.action === 'REFRESH'"
+          :icon="h(ReloadOutlined)"
+          @click="refresh"
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button v-else-if="item.action === 'NOTICE'" :icon="h(BellTwoTone)">
+          {{ item.name }}
+        </a-button>
+        <a-button
           v-else-if="item.action === 'OPEN_REMOTE_COMPONENT_MODULE_IN_MODAL'"
+          :icon="h(HddOutlined)"
           @click="openRemoteComponentModule(item)"
-        >{{ item.name }}</span>
-        <span
-          v-else-if="item.action === 'NOTICE'"
-          @click="notificationModal = true"
-        >{{ item.name }}</span>
-        <span v-else>{{ item.name }}</span>
+        >
+          {{ item.name }}
+        </a-button>
+        <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
       </a-breadcrumb-item>
     </a-breadcrumb>
   </div>
@@ -102,7 +159,13 @@
     </template>
   </Modal>
 
+  <<<<<<< HEAD
   <component :is="modal1Component" v-model:open="modal1Open" />
+  =======
+  <!-- <a-modal v-model:open="modal1Open"> -->
+  <component :is="modal1Component" v-model:open="modal1Open" />
+  <!-- </a-modal> -->
+  >>>>>>> 7c654a40a88c1d0fdbac8e4dcbf23196a59944f7
 </template>
 
 <script setup>
@@ -113,6 +176,7 @@ import {
   watch,
   getCurrentInstance,
   defineAsyncComponent,
+  h,
 } from 'vue';
 import Common from '../../common/Common';
 import DownloadService from '../../resource/file/DownloadService.js';
@@ -135,6 +199,7 @@ import {
   ContainerTwoTone,
   ControlTwoTone,
   ReloadOutlined,
+  LayoutTwoTone,
 } from '@ant-design/icons-vue';
 const props = defineProps({
   window: {
@@ -187,6 +252,7 @@ const emit = defineEmits([
   'createRecordInWindowEdit',
   'deleteRecords',
   'refreshDatas',
+  'judgeIsHaveButtons',
 ]);
 
 const tabButtons = ref([]);
@@ -213,7 +279,9 @@ const deleteData = () => {
 const refresh = () => {
   emit('refreshDatas', false);
 };
-
+const closeModal = () => {
+  modal1Open.value = false;
+};
 /**
  * 导出确认
  */
@@ -423,6 +491,11 @@ const tabButtonsHandler = nowTabButtons => {
       leftTabButton.value.push(item);
     }
   });
+  if (leftTabButton.value.length > 0 && rightTabButton.value.length > 0) {
+    emit('judgeIsHaveButtons', true);
+  } else {
+    emit('judgeIsHaveButtons', false);
+  }
 };
 // 用来判断分组的表头按钮是否有值
 const isEmpty = obj => {
@@ -493,6 +566,7 @@ const openRemoteComponentModule = async function (tabButton) {
 
     modal1Component.value = testAsyncRemoteComponent;
     modal1Open.value = true;
+    console.log(modal1Component.value);
   }
 };
 </script>
@@ -502,5 +576,9 @@ const openRemoteComponentModule = async function (tabButton) {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-right: 6px;
+}
+.ant-btn {
+  padding: 4px 10px;
 }
 </style>

src/window1/tabGridView/TabGridEdit.vue

@@ -11,6 +11,7 @@
     <div
       class="grid-container" :style="{
         'padding-right': showComplexFilterPanel == true ? '360px' : '0px',
+        'grid-template-rows': isHaveButtons === true ? '40px 40px auto 40px' : '40px 6px auto 40px'
       }"
     >
       <div class="operationClass">
@@ -36,7 +37,7 @@
           :complex-filter-params="complexFilterParams" :uuid="uuid" :show-tab-dto="tab" :model-datas="modelDatas"
           :view-type="'Grid'" :curd-window-function-access="curdWindowFunctionAccess"
           @create-record-in-window-edit="createRecordInWindowEdit" @delete-records="deleteRecords"
-          @refresh-datas="refreshDatas"
+          @refresh-datas="refreshDatas" @judge-is-have-buttons="judgeIsHaveButtons"
         />
       </div>
 
@@ -1758,6 +1759,9 @@ export default {
         },
       );
     },
+    judgeIsHaveButtons: function (flag) {
+      this.isHaveButtons = flag;
+    },
   },
 };
 </script>
@@ -1822,7 +1826,7 @@ export default {
 }
 
 .tableFixHead {
-  margin-top: -16px;
+  margin-top: -6px;
 }
 
 :deep( :where(.css-dev-only-do-not-override-16pw25h).ant-breadcrumb .ant-breadcrumb-link > .anticon + span,

src/workflow/ApproveComment.vue

@@ -200,6 +200,7 @@
       :title="$t('lang.approveComment.notice')"
       :cancel-text="$t('lang.approveComment.cancel')"
       :ok-text="$t('lang.approveComment.confirm')"
+      @ok="confirmApprove"
     >
       {{ $t("lang.approveComment.confirmSubmit") }}
     </a-modal>
@@ -209,6 +210,7 @@
       :title="$t('lang.approveComment.notice')"
       :cancel-text="$t('lang.approveComment.cancel')"
       :ok-text="$t('lang.approveComment.confirm')"
+      @ok="confirmReject"
     >
       {{ $t("lang.approveComment.rejectConfirm") }}
     </a-modal>