n20-common-lib 2.22.24 → 2.22.25

package/package.json

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

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -1,28 +1,13 @@
 <template>
-  <div
-    class="w-100p flex-box"
-    :style="{
-      display: 'grid',
-      flexWrap: 'wrap',
-      gridTemplateColumns: `repeat(${columns}, 1fr)`,
-      gap: '16px',
-      padding: '0',
-      overflowX: 'hidden'
-    }"
-  >
-    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box" style="width: 100%; padding: 0 20px">
+  <div class="w-100p">
+    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box m-l-m m-r-m">
       <el-form-item
         class="m-r-ss m-b-s"
-        :label-width="labelWidth"
         :class="item.cfgHasRemark === '1' ? 'flex-auto' : 'flex-1'"
         :label="item.cfgName"
       >
         <span slot="label">
-          <span
-            v-title="item.cfgName"
-            style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
-            :style="{ maxWidth: labelWidth }"
-          >
+          <span style="display: inline-block; white-space: wrap">
             <span v-if="required" style="color: red">*</span>
             {{ item.cfgName }}
           </span>
@@ -56,20 +41,10 @@
         >
           <el-option v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.value" :value="row.code" />
         </el-select>
-        <el-radio-group
-          v-if="item.cfgType === '22'"
-          v-model="item.cfgVal"
-          class="input-w"
-          @change="(val) => changeFn(val, item)"
-        >
+        <el-radio-group v-if="item.cfgType === '22'" v-model="item.cfgVal" @change="(val) => changeFn(val, item)">
           <el-radio v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.code">{{ row.value }}</el-radio>
         </el-radio-group>
-        <el-checkbox-group
-          v-if="item.cfgType === '32'"
-          v-model="item.checkList"
-          class="input-w"
-          @change="(val) => changeFn(val, item)"
-        >
+        <el-checkbox-group v-if="item.cfgType === '32'" v-model="item.checkList" @change="(val) => changeFn(val, item)">
           <el-checkbox v-for="(row, i) in JSON.parse(item.cfgJson || '[]')" :key="i" :label="row.code">{{
             row.value
           }}</el-checkbox>
@@ -105,18 +80,10 @@
 import axios from '../../utils/axios'
 export default {
   props: {
-    labelWidth: {
-      type: String,
-      default: '12em'
-    },
     taskId: {
       type: [String, Number],
       default: ''
     },
-    columns: {
-      type: Number,
-      default: 1
-    },
     form: {
       type: Object,
       default: () => ({})
@@ -143,6 +110,34 @@ export default {
     this.getData(this.otherAttDataA)
   },
   methods: {
+    setDefaultValue(item) {
+      const defaultTypes = ['22', '21', '31', '32']
+      // 不满足条件的直接返回
+      if (!defaultTypes.includes(item.cfgType) || item.cfgVal) return
+
+      try {
+        // 解析cfgJson，获取默认选项
+        const cfgJson = JSON.parse(item.cfgJson || '[]')
+        const defaultItems = cfgJson.filter((row) => row.isDefault === '1')
+        if (!defaultItems.length) return
+        // 获取默认选项的code值
+        const defaultCodes = defaultItems.map((row) => row.code)
+        if (['22', '21'].includes(item.cfgType)) {
+          item.cfgVal = defaultCodes[0]
+          item.cfgText = defaultItems[0]?.value
+        } else if (['31', '32'].includes(item.cfgType)) {
+          item.cfgVal = defaultCodes.join(',')
+          item.cfgText = defaultItems.map((row) => row.value).join(',')
+          if (item.cfgType === '31') {
+            item.selectList = defaultCodes
+          } else {
+            item.checkList = defaultCodes
+          }
+        }
+      } catch (e) {
+        // JSON解析失败时忽略
+      }
+    },
     getData(data) {
       if (data.length) {
         this.otherAttData = data
@@ -155,6 +150,10 @@ export default {
                 if (['32'].includes(item.cfgType)) {
                   item.checkList = item.checkList ? item.checkList : []
                 }
+                if (['31'].includes(item.cfgType)) {
+                  item.selectList = item.selectList ? item.selectList : []
+                }
+                this.setDefaultValue(item)
                 return item
               }) || []
           }

package/src/components/HandlingAdvice/index.vue

@@ -33,9 +33,9 @@
         </el-form-item>
       </el-form>
       <ExpandablePane v-if="otherAttDataA.length > 0" title="自定义项" :default-expand="true">
-        <el-form ref="approveBtnGroup" label-position="right" :label-width="labelWidth">
+        <el-form ref="approveBtnGroup" label-position="top">
           <div
-            class="p-b-lg p-t-lg p-r-lg"
+            class="p-b-s p-t-s"
             style="max-height: 350px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
           >
             <show-other-att-new
@@ -44,8 +44,6 @@
               :other-att-data-a="otherAttDataA"
               :proc-inst-id="procInstId || this.$route.query.processInstanceId"
               :required="true"
-              :columns="columns"
-              :label-width="labelWidth"
             />
           </div>
         </el-form>
@@ -71,14 +69,7 @@ export default {
       type: String,
       default: '85%'
     },
-    labelWidth: {
-      type: String,
-      default: '12em'
-    },
-    columns: {
-      type: Number,
-      default: 1
-    },
+
     afterGetConf: {
       type: Function,
       default: undefined