n20-common-lib 2.6.51 → 2.6.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.51",
+  "version": "2.6.53",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -124,4 +124,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/assets/css/filter.scss

@@ -8,7 +8,7 @@
   display: flex;
   align-items: center;
   flex: 1;
-  padding: 8px;
+  padding: 8px 0;
 
   &-item.n20-advanced-filter-active {
     border-color: #b3d0ff;

package/src/assets/realUrl.js

@@ -6,7 +6,7 @@ export default function realUrl(url, rest = false) {
     return url
   } else if (/^\//.test(url)) {
     return prefix + url.replace(/^\//, '')
-  } else if (!rest) {
+  } else if (rest) {
     return '/' + url
   } else {
     return url

package/src/components/ApprovalButtons/index.vue

@@ -339,8 +339,15 @@ export default {
     this.getShowApprovalTo()
     this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
+    this.getConfiguration()
   },
   methods: {
+    // 意见是否必填
+    getConfiguration() {
+      getJsonc('portal/server-config.jsonc').then(({ opinionRequired }) => {
+        this.required = opinionRequired ?? this.required
+      })
+    },
     getTodoList() {
       return new Promise((resolve, reject) => {
         const dto = JSON.parse(sessionStorage.getItem(`approvalDto`))

package/src/components/Descriptions/index.vue

@@ -1,6 +1,9 @@
 <template>
   <el-descriptions class="n20-descriptions" :column="column" size="default" border>
     <slot></slot>
+    <template v-if="this.$slots.default.length === 1">
+      <el-descriptions-item v-for="(item, index) in column - 1" :key="index" />
+    </template>
   </el-descriptions>
 </template>
 
@@ -13,6 +16,7 @@ export default {
     }
   },
   created() {
+    console.log(this.$slots.default)
     this.resize()
     window.addEventListener('resize', this.resize)
   },