n20-common-lib 2.4.52 → 2.4.53

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "n20-common-lib",
-  "version": "2.4.52",
+  "version": "2.4.53",
   "private": false,
   "main": "src/index.js",
   "scripts": {
+    "dev": "vue-cli-service serve --doc",
     "serve": "vue-cli-service serve",
     "serve:theme": "vue-cli-service serve --testTheme",
     "test": "vue-cli-service serve --test",

package/src/assets/css/normalize.scss

@@ -394,6 +394,7 @@ iframe {
   box-shadow: 0px 2px 8px 0px rgba($--color-black, 0.08);
 }
 
+// 底部统计翻页
 .page-footer-shadow {
   position: relative;
   height: 28px;
@@ -411,6 +412,7 @@ iframe {
   }
 }
 
+// 底部操作按钮
 .page-button-shadow {
   position: relative;
   height: 44px;

package/src/components/FlowStep/index.vue

@@ -76,7 +76,17 @@ export default {
   data() {
     return {
       // 若当前选中步骤超过总步骤数，则默认选择步骤1
-      current: this.currentStep > this.totalSteps ? 1 : this.currentStep
+      // current: this.currentStep > this.totalSteps ? 1 : this.currentStep
+    }
+  },
+  computed: {
+    current: {
+      get() {
+        return this.currentStep > this.totalSteps ? 1 : this.currentStep
+      },
+      set(val) {
+        this.$emit('change', val)
+      }
     }
   },
   methods: {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -106,13 +106,14 @@
       <div class="flex-box">
         <img v-popover:by_popover class="user-info-btn header-color" :src="headerUserUrl" />
         <div
-          v-if="customOpt?.companyName"
           v-title:br="rolesList.map((el) => el.name).join(',')"
           :style="{ width: (userInfo?.companyName?.length * 0.86 || 4) + 'em', overflow: 'hidden' }"
-          class="pointer"
+          class="pointer flex-column flex-c"
           @click="handleUser"
         >
-          <div class="font-size-small text-ellipsis">{{ userNo }}/{{ rolesList.map((el) => el.name).join('/') }}</div>
+          <div class="font-size-small text-ellipsis">
+            {{ userNo }}{{ rolesList.length ? '/' : '' }}{{ rolesList.map((el) => el.name).join('/') }}
+          </div>
           <div class="companyClass">{{ userInfo.companyName }}</div>
         </div>
       </div>

package/src/components/Layout/indexN.vue

@@ -173,7 +173,7 @@ export default {
   methods: {
     setMainTab(ev) {
       const { targetName, replaceTab, addTab, closeTab, setTabName, addTabO, refreshTab } = ev.data
-
+      console.log(refreshTab)
       if (targetName === 'main') {
         replaceTab && this.tabReplace(replaceTab)
         addTab && this.tabAdd(addTab)
@@ -403,6 +403,7 @@ export default {
     },
     tabRefresh({ uuid, path }) {
       let tab = undefined
+      console.log(this.tabList)
       if (uuid) {
         tab = this.tabList.find((t) => uuid === t.uuid)
       } else if (path) {

package/src/components/LoginTemporary/indexN.vue

@@ -359,7 +359,7 @@ export default {
     // window.addEventListener('resize', this.setWrapSty)
 
     this.init()
-
+    localStorage.removeItem('pageInType')
     localStorage.setItem('pageInSystemNo', this.form.SYSTEM_LIST[0].NO)
   },
   beforeDestroy() {

package/src/components/TablePro/index.vue

@@ -65,7 +65,7 @@
         />
       </template>
     </vxe-table>
-    <tableSetSize :size="sizeC" :show-setsize="showSetsize" @update:size="sizeUp" @resize="sizeSet" />
+    <tableSetSize v-if="showSetsize" :size="sizeC" @update:size="sizeUp" @resize="sizeSet" />
   </div>
 </template>
 

package/src/i18n.json

@@ -6,7 +6,7 @@
     "en": "Data request"
   },
   "新一代集团财资管理系统": {
-    "en": "New generation group accounting system"
+    "en": "Group Treasury Management System"
   },
   "不支持在线预览，请": {
     "en": "Online preview is not supported, please"
@@ -234,7 +234,7 @@
     "en": "Approval Opinions"
   },
   "批 准": {
-    "en": "Approval"
+    "en": "Approve"
   },
   "请输入手机号": {
     "en": "Please enter your mobile phone number"
@@ -402,7 +402,7 @@
     "en": "Information presentation component"
   },
   "驳回至发起人": {
-    "en": "Rejected to promoter"
+    "en": "Reject to initiator"
   },
   "驳回至申请人": {
     "en": "Rejected to applicant"
@@ -1515,7 +1515,7 @@
     "en": "Approved to"
   },
   "驳回至": {
-    "en": "Rejected to"
+    "en": "Reject"
   },
   "设置抄送用户": {
     "en": "Set Cc User"

package/src/index.js

@@ -102,7 +102,7 @@ import auth from './utils/auth.js'
 import axios from './utils/axios.js'
 import downloadBlob from './utils/downloadBlob.js'
 import forEachs from './utils/forEachs'
-import { setTabs } from './utils/handleTab.js'
+import { setTabs, refreshTab } from './utils/handleTab.js'
 import imgLoad from './utils/imgLoad.js'
 import importG from './utils/importGlobal.js' // 联合加载组件保存位置
 import list2tree from './utils/list2tree'
@@ -338,5 +338,6 @@ export {
   repairEl,
   // 页签/路由
   setTabs,
+  refreshTab,
   version
 }