n20-common-lib 3.2.53 → 3.2.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.53",
+  "version": "3.2.54",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -162,39 +162,43 @@
     </div>
     <!-- 审批按钮 -->
     <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
-      <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
-      <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
-      <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
-      <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
-      <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
+      <el-button type="primary" @click="showAdvancePop">{{ $lc(btnsNames['approval']) }}</el-button>
+      <el-button type="primary" @click="approvalToV = true">{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button>
+      <el-button plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button>
+      <el-button plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
+      <el-button type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
 
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
-        btnsNames['pass']
+        $lc(btnsNames['pass'])
       }}</el-button>
-      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
-      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{
+        $lc(btnsNames['refuse'])
+      }}</el-button>
+      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ $lc(btnsNames['takeOff']) }}</el-button>
       <!-- END -->
       <el-button v-if="authList.includes('approval')" type="primary" @click="showAdvancePop">{{
-        btnsNames['approval']
+        $lc(btnsNames['approval'])
       }}</el-button>
       <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
-        {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
+        {{ $lc(btnsNames['approval']) }}{{ '并审批下一条' | $lc }}</el-button
       >
       <el-button v-if="showApprovalTo && showApproveTo" type="primary" @click="approvalToV = true"
-        >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
+        >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
       >
-      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
-      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{
+        $lc(btnsNames['rejectTo'])
+      }}</el-button>
+      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
       <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
-        btnsNames['rejectPre']
+        $lc(btnsNames['rejectPre'])
       }}</el-button>
 
       <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
-        btnsNames['discard']
+        $lc(btnsNames['discard'])
       }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
@@ -517,14 +521,14 @@ export default {
       checkSum: 0,
       mustUploadWidget: false,
       btnsNames: {
-        pass: $lc('通过'),
-        refuse: $lc('拒绝'),
-        takeOff: $lc('请假'),
-        reject: $lc('驳回至申请人'),
-        rejectPre: $lc('驳回至上一节点'),
-        approval: $lc('批 准'),
-        discard: $lc('作 废'),
-        rejectTo: $lc('驳回至')
+        pass: '通过',
+        refuse: '拒绝',
+        takeOff: '请假',
+        reject: '驳回至申请人',
+        rejectPre: '驳回至上一节点',
+        approval: '批 准',
+        discard: '作 废',
+        rejectTo: '驳回至'
       }
     }
   },
@@ -711,7 +715,7 @@ export default {
           // 自定义按钮
           if (data.customBtnName && data.customBtnName.length > 0) {
             data.customBtnName.forEach((item) => {
-              this.btnsNames[item.key] = item.optionName
+              this.$set(this.btnsNames, item.key, item.optionName)
             })
           }
           let { taskDefKey, menuAuthority } = data

package/src/components/ApprovalButtons/indexApp.vue

@@ -140,11 +140,11 @@
     </div>
     <!-- 审批按钮 -->
     <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
-      <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
-      <!--       <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
-      <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
-      <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
-      <!--       <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
+      <el-button type="primary" @click="showAdvancePop">{{ $lc(btnsNames['approval']) }}</el-button>
+      <!--       <el-button type="primary" @click="approvalToV = true">{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button>
+      <el-button plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button> -->
+      <el-button plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
+      <!--       <el-button type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button> -->
     </div>
 
@@ -154,31 +154,29 @@
       </div>
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
-        btnsNames['pass']
+        $lc(btnsNames['pass'])
       }}</el-button>
-      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
-      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{
+        $lc(btnsNames['refuse'])
+      }}</el-button>
+      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ $lc(btnsNames['takeOff']) }}</el-button>
       <!-- END -->
       <el-button v-if="authList.includes('approval') && approveBtns" type="primary" @click="showAdvancePop">{{
-        btnsNames['approval']
+        $lc(btnsNames['approval'])
       }}</el-button>
       <!--  <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
-        {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
+        {{ $lc(btnsNames['approval']) }}{{ '并审批下一条' | $lc }}</el-button
       >
       <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true"
-        >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
+        >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
       >
-      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button> -->
       <el-button v-if="authList.includes('reject') && approveBtns" plain @click="rejectFn">{{
-        btnsNames['reject']
-      }}</el-button>
-      <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
-        btnsNames['rejectPre']
+        $lc(btnsNames['reject'])
       }}</el-button>
+      <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{ $lc(btnsNames['rejectPre']) }}</el-button>
 
-      <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
-        btnsNames['discard']
-      }}</el-button>
+      <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button> -->
     </div>
     <!-- 设置抄送用户 -->
@@ -496,14 +494,14 @@ export default {
       checkSum: 0,
       mustUploadWidget: false,
       btnsNames: {
-        pass: $lc('通过'),
-        refuse: $lc('拒绝'),
-        takeOff: $lc('请假'),
-        reject: $lc('驳回'),
-        rejectPre: $lc('驳回至上一节点'),
-        approval: $lc('批 准'),
-        discard: $lc('作 废'),
-        rejectTo: $lc('驳回至')
+        pass: '通过',
+        refuse: '拒绝',
+        takeOff: '请假',
+        reject: '驳回',
+        rejectPre: '驳回至上一节点',
+        approval: '批 准',
+        discard: '作 废',
+        rejectTo: '驳回至'
       },
       approveBtns: true
     }
@@ -645,7 +643,7 @@ export default {
           // 自定义按钮
           if (data.customBtnName && data.customBtnName.length > 0) {
             data.customBtnName.forEach((item) => {
-              this.btnsNames[item.key] = item.optionName
+              this.$set(this.btnsNames, item.key, item.optionName)
             })
           }
           let { taskDefKey, menuAuthority } = data

package/src/components/ProFilterView/index.vue

@@ -11,8 +11,8 @@
           trigger="click"
           class="m-r-s"
         >
-          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== $lc('无视图') }">
-            <div class="flex-box flex-v m-r">
+          <el-button slot="reference" class="botton view-button" :class="{ activiti: selectedItem !== $lc('无视图') }">
+            <div class="flex-box flex-v">
               <i class="v3-icon-inbox"></i>
               <div class="popover-title" style="margin: 0 8px" :title="selectedItem">{{ selectedItem }}</div>
               <i class="n20-icon-xiala-moren"></i>
@@ -70,7 +70,10 @@
           <el-button
             v-if="isFilter"
             icon="v3-icon-filter"
-            class="m-r-s botton"
+            class="m-r-s botton filter-button"
+            :class="{ 'is-filter-expanded': filterExpanded }"
+            tabindex="-1"
+            @mousedown.native.prevent
             @click="filterExpanded = !filterExpanded"
             >{{ '筛选' | $lc }}</el-button
           >
@@ -219,10 +222,10 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import advancedQuery from './advancedQuery.vue'
 
 import axios from '../../utils/axios.js'
+import { $lc } from '../../utils/i18n/index'
 import ClAdvancedFilter from '../AdvancedFilter/index.vue'
 import ClDialog from '../Dialog/index.vue'
 import ClDragList from '../DragList/index.vue'
@@ -515,10 +518,10 @@ export default {
           item.type === 'daterange'
             ? [item.startDate, item.endDate]
             : item.type === 'numberrange'
-            ? [item.startValue, item.endValue]
-            : item.slotFields?.length
-            ? item.slotFields
-            : [item.value]
+              ? [item.startValue, item.endValue]
+              : item.slotFields?.length
+                ? item.slotFields
+                : [item.value]
 
         keys.forEach((k) => allFilterKeys.add(k))
         if (item.required) {
@@ -818,4 +821,21 @@ export default {
   padding: 0 !important;
   border-bottom: none !important;
 }
+
+.filter-button,
+.view-button {
+  padding: 8px 12px !important;
+  height: 32px;
+}
+
+.filter-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.filter-button.is-filter-expanded {
+  color: var(--color-blue-6, #007aff);
+  background: var(--color-blue-1, #e8f7ff);
+}
 </style>

package/src/i18n.json

@@ -11821,5 +11821,12 @@
     "vi": "Quay lại bước trước",
     "ja": "前のステップに戻る",
     "zh-hk": "撤回至上一步"
+  },
+  "未知": {
+    "en": "Unknown",
+    "th": "ไม่ทราบ",
+    "vi": "Không xác định",
+    "ja": "不明",
+    "zh-hk": "未知"
   }
-}
+}