n20-common-lib 2.2.34 → 2.2.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.34",
+  "version": "2.2.36",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalButtons/index.vue

@@ -362,14 +362,14 @@ export default {
       }
     },
     addErrFn() {
-      this.addMsg = '审批方式不能为空'
+      this.addMsg = $lc('审批方式不能为空')
       setTimeout(() => {
         this.addMsg = undefined
       }, 1000)
     },
     errMsgFn(str = '') {
       this.$refs['msg-input'].focus()
-      this.errMsg = str + '操作，意见不能为空'
+      this.errMsg = str + $lc('操作，意见不能为空')
       setTimeout(() => {
         this.errMsg = undefined
       }, 1000)
@@ -386,7 +386,7 @@ export default {
     // 驳回
     rejectFn() {
       if (!this.messageC) {
-        return this.errMsgFn('驳回')
+        return this.errMsgFn($lc('驳回'))
       }
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
@@ -396,7 +396,7 @@ export default {
     },
     rejectToB() {
       if (!this.messageC) {
-        return this.errMsgFn('驳回')
+        return this.errMsgFn($lc('驳回'))
       }
       this.rejectToV = true
     },
@@ -415,7 +415,7 @@ export default {
     // 驳回到上一步
     rejectPreFn(list) {
       if (!this.messageC) {
-        return this.errMsgFn('驳回')
+        return this.errMsgFn($lc('驳回'))
       }
       this.beforeFn(this.beforeRejectPre, () => {
         axios.post('/bems/activiti/admin/todo/rejectpre', this.getParam()).then(({ data }) => {
@@ -450,7 +450,7 @@ export default {
     // 作废
     discardFn() {
       if (!this.messageC) {
-        return this.errMsgFn('作废')
+        return this.errMsgFn($lc('作废'))
       }
       this.beforeFn(this.beforeDiscard, () => {
         axios.post('/bems/activiti/admin/todo/cancle', this.getParam()).then(({ data }) => {

package/src/components/FileUploadTable/index.vue

@@ -104,7 +104,7 @@
           <slot slot="header" slot-scope="scope" name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
           <slot slot-scope="{ row }" name="time" :row="row">{{ row[keys.time] }}</slot>
         </el-table-column>
-        <el-table-column :label="'上传人' | $lc" :prop="keys.user">
+        <el-table-column v-if="!hideUser" :label="'上传人' | $lc" :prop="keys.user">
           <slot slot="header" slot-scope="scope" name="user-header" :column="scope.column">{{ '上传人' | $lc }}</slot>
           <slot slot-scope="{ row }" name="user" :row="row">{{ row[keys.user] }}</slot>
         </el-table-column>
@@ -320,6 +320,10 @@ export default {
     getFileMethod: {
       type: Function,
       default: undefined
+    },
+    hideUser: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/LoginSetting/setItem.vue

@@ -231,7 +231,7 @@ export default {
         LOGIN_URL: '',
         GROUP_NAME: '',
         LOGIN_SLOGAN: '',
-        LOGIN_BG: '',
+        LOGIN_BG: '/portal/server-assets/loginBg.jpg',
         LOGIN_BG_TYPE: 'dark',
         LOGIN_LOGO: '',
         LOGIN_TYPE: 'T1',