n20-common-lib 3.0.20 → 3.0.21

package/package.json

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

package/src/components/AdvancedFilter/formItemRender.vue

@@ -368,7 +368,9 @@ export default {
               ruleErrorHide: item.ruleErrorHide,
               rules: item.rules,
               readonly: item.type === 'search',
-              placeholder: item.props && item.props.placeholder ? item.props.placeholder : $lc('请输入')
+              placeholder: item.props && item.props.placeholder ? item.props.placeholder : $lc('请输入'),
+              maxlength: item.props && item.props.maxlength,
+              minlength: item.props && item.props.minlength
             },
 
             directives: [
@@ -792,7 +794,9 @@ export default {
             'rule-form': 'ruleValidate',
             rules: item.rules,
             ruleErrorHide: item.ruleErrorHide,
-            placeholder: item.props && item.props.placeholder ? item.props.placeholder : $lc('请输入')
+            placeholder: item.props && item.props.placeholder ? item.props.placeholder : $lc('请输入'),
+            maxlength: item.props && item.props.maxlength,
+            minlength: item.props && item.props.minlength
           },
           on: {
             blur: this.handleBlur,

package/src/components/Anchor/index.vue

@@ -4,6 +4,7 @@
       v-if="position !== 'right'"
       :nav-list="navList"
       :activit="value"
+      :use-slot-in-nav="useSlotInNav"
       :style="{ width: navWidth }"
       class="left-side"
       :class="{ 'top-css': position === 'top' }"
@@ -16,6 +17,7 @@
       v-if="position === 'right'"
       :nav-list="navList"
       :activit="value"
+      :use-slot-in-nav="useSlotInNav"
       :style="{ width: navWidth, marginLeft: '10px' }"
       @click="activitFn"
     />
@@ -49,6 +51,10 @@ export default {
     navWidth: {
       type: String,
       default: '110px'
+    },
+    useSlotInNav: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

package/src/components/Anchor/sidebar.vue

@@ -8,11 +8,15 @@ export default {
     activit: {
       type: [String, Number],
       default: undefined
+    },
+    useSlotInNav: {
+      type: Boolean,
+      default: false
     }
   },
   render() {
     let _vm = this
-    let { navList, activit, _c, _l, _v, _s } = _vm
+    let { navList, activit, useSlotInNav, _c, _l, _v, _s } = _vm
 
     return _c(
       'div',
@@ -30,7 +34,7 @@ export default {
               }
             }
           },
-          item.slotT ? item.slotT : [_v(_s(item.title))]
+          useSlotInNav && item.slotT ? item.slotT : [_v(_s(item.title))]
         )
       }),
       0

package/src/components/ApprovalButtons/index.vue

@@ -184,7 +184,7 @@
       <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
         {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
       >
-      <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true"
+      <el-button v-if="showApprovalTo && showApproveTo" type="primary" @click="approvalToV = true"
         >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
       >
       <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
@@ -459,6 +459,8 @@ export default {
   data() {
     this.msgisSync = !!this.$listeners['update:message']
     return {
+      // 是否显示批准至（读取门户配置）
+      showApproveTo: true,
       attributes: undefined,
       isWyfk: false,
       nextEgwOutgoingNodeId: undefined,
@@ -512,7 +514,7 @@ export default {
         pass: this.$l('通过'),
         refuse: this.$l('拒绝'),
         takeOff: this.$l('请假'),
-        reject: this.$l('驳回至发起人'),
+        reject: this.$l('驳回至申请人'),
         rejectPre: this.$l('驳回至上一节点'),
         approval: this.$l('批 准'),
         discard: this.$l('作 废'),
@@ -646,8 +648,9 @@ export default {
     // 意见是否必填
     getConfiguration() {
       getJsonc('portal/server-config.jsonc', null, true)
-        .then(({ opinionRequired }) => {
+        .then(({ opinionRequired, showApproveTo }) => {
           this.requiredC = opinionRequired ?? this.required
+          this.showApproveTo = showApproveTo ?? true
           // 读取该工作流是否意见必填
           if (this.$route.query.remarkIsMust !== undefined) {
             this.requiredC = this.$route.query.remarkIsMust === '1'
@@ -738,9 +741,10 @@ export default {
           }
         })
     },
-    // 获取是否显示驳回至按钮
+    // 获取是否显示驳回至批准按钮
     getShowApprovalTo() {
       if (this.showBtn && this.$route.query.state === '2') {
+        // 再读一个开关 false false
         axios
           .get(`/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`, null, {
             noMsg: true
@@ -904,7 +908,7 @@ export default {
       if (!this.showFlowDialog) {
         this.beforeFn(this.beforeReject, () => {
           axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
-            this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至发起人'))
+            this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至申请人'))
           })
         })
       }
@@ -913,7 +917,7 @@ export default {
       this.showFlowDialog = false
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
-          this.thenMsg(data, $lc('驳回至发起人'))
+          this.thenMsg(data, $lc('驳回至申请人'))
         })
       })
     },

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -13,7 +13,7 @@
     <div v-for="(item, i) in otherAttData" :key="i" class="flex-box flex-v" style="width: 100%; padding: 0 20px">
       <el-form-item
         class="m-r-ss m-b-s"
-        label-width="210px"
+        :label-width="labelWidth"
         :class="item.cfgHasRemark === '1' ? 'flex-auto' : 'flex-1'"
         :label="item.cfgName"
       >
@@ -110,6 +110,10 @@
 import axios from '../../utils/axios'
 export default {
   props: {
+    labelWidth: {
+      type: String,
+      default: '12em'
+    },
     taskId: {
       type: [String, Number],
       default: ''

package/src/components/ApprovalRecord/approvalImgPro/child.vue

@@ -300,7 +300,7 @@ export default {
         this.svgW.querySelector(`[data-element-id="${from}"]`).classList.add('activiti-node-reject')
         if (type === '1') {
           this.svgW.querySelector(`[data-element-id="${to}"]`).classList.add('activiti-node-reject')
-          this.setRejectLink(from, to, $lc('驳回至发起人'))
+          this.setRejectLink(from, to, $lc('驳回至申请人'))
         } else if (type === '2') {
           this.setRejectLink(from, to, $lc('驳回至上一步'))
         } else if (type === '3') {

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -346,7 +346,7 @@ export default {
         this.svgW.querySelector(`[data-element-id="${from}"]`).classList.add('activiti-node-reject')
         if (type === '1') {
           this.svgW.querySelector(`[data-element-id="${to}"]`).classList.add('activiti-node-reject')
-          this.setRejectLink(from, to, $lc('驳回至发起人'))
+          this.setRejectLink(from, to, $lc('驳回至申请人'))
         } else if (type === '2') {
           this.setRejectLink(from, to, $lc('驳回至上一步'))
         } else if (type === '3') {

package/src/components/FileUploadTable/index.vue

@@ -16,8 +16,9 @@
           <el-button size="mini" plain @click="batchPrint">{{ '批量打印' | $lc }}</el-button>
         </slot>
         <slot name="down-btn">
-          <el-button size="mini" plain @click="downRows">{{ '下载' | $lc }}</el-button>
+          <el-button v-if="showDownLoadBtn" size="mini" plain @click="downRows">{{ '下载' | $lc }}</el-button>
         </slot>
+        <slot name="other-btn"></slot>
         <slot v-if="!readonly" name="delete-btn">
           <el-button type="danger" plain size="mini" @click="deleteRows">{{ '删除' | $lc }}</el-button>
         </slot>
@@ -209,7 +210,7 @@
             @click="AiFn(row)"
           />
           <el-button
-            v-if="readonly"
+            v-if="readonly && showDownLoadBtn"
             type="text"
             icon="el-icon-download"
             :disabled="!row[keys.url]"
@@ -377,10 +378,8 @@ export default {
     }
   },
   props: {
-    AICheck: {
-      type: Boolean,
-      default: false
-    },
+    showDownLoadBtn: { type: Boolean, default: true },
+    AICheck: {},
     AIOptions: {
       type: Object,
       default: () => ({})

package/src/components/FileUploadTable/jytg.svg

@@ -1,6 +1,6 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="design-iconfont">
-  <path d="M8.24182 3.58716L11.2487 8.99438V6.31665H13.3151V12.9797L11.3785 13.4827L7.3219 6.18677L4.3512 11.3323H8.37366V13.3997H2.56018L1.66565 11.8499L6.44397 3.57349L8.24182 3.58716Z" fill="#007AFF"/>
-  <path d="M12.2593 1.66284L12.7877 3.21041L14.3353 3.73888L12.7877 4.26736L12.2593 5.81492L11.7308 4.26736L10.1832 3.73888L11.7308 3.21041L12.2593 1.66284Z" fill="#007AFF"/>
-  <path d="M2.32765 3.57349L2.68419 4.61759L3.72829 4.97413L2.68419 5.33068L2.32765 6.37478L1.9711 5.33068L0.927002 4.97413L1.9711 4.61759L2.32765 3.57349Z" fill="#007AFF"/>
-  <path d="M9.83558 13.011L10.0044 13.5053L10.4987 13.6741L10.0044 13.8429L9.83558 14.3372L9.66679 13.8429L9.17249 13.6741L9.66679 13.5053L9.83558 13.011Z" fill="#007AFF"/>
-</svg>
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="design-iconfont">
+  <path d="M8.24182 3.58716L11.2487 8.99438V6.31665H13.3151V12.9797L11.3785 13.4827L7.3219 6.18677L4.3512 11.3323H8.37366V13.3997H2.56018L1.66565 11.8499L6.44397 3.57349L8.24182 3.58716Z" fill="#007AFF"/>
+  <path d="M12.2593 1.66284L12.7877 3.21041L14.3353 3.73888L12.7877 4.26736L12.2593 5.81492L11.7308 4.26736L10.1832 3.73888L11.7308 3.21041L12.2593 1.66284Z" fill="#007AFF"/>
+  <path d="M2.32765 3.57349L2.68419 4.61759L3.72829 4.97413L2.68419 5.33068L2.32765 6.37478L1.9711 5.33068L0.927002 4.97413L1.9711 4.61759L2.32765 3.57349Z" fill="#007AFF"/>
+  <path d="M9.83558 13.011L10.0044 13.5053L10.4987 13.6741L10.0044 13.8429L9.83558 14.3372L9.66679 13.8429L9.17249 13.6741L9.66679 13.5053L9.83558 13.011Z" fill="#007AFF"/>
+</svg>

package/src/components/FileUploadTable/wsc.svg

@@ -1,3 +1,3 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.33334 7.99998C1.33334 4.31808 4.31811 1.33331 8.00001 1.33331C11.6819 1.33331 14.6667 4.31808 14.6667 7.99998C14.6667 11.6819 11.6819 14.6666 8.00001 14.6666C4.31811 14.6666 1.33334 11.6819 1.33334 7.99998ZM7.33335 10.6095L11.6381 6.30473L10.6953 5.36192L7.33335 8.72385L5.47142 6.86192L4.52862 7.80473L7.33335 10.6095Z" fill="#CCC"/>
-</svg>
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="design-iconfont">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.33334 7.99998C1.33334 4.31808 4.31811 1.33331 8.00001 1.33331C11.6819 1.33331 14.6667 4.31808 14.6667 7.99998C14.6667 11.6819 11.6819 14.6666 8.00001 14.6666C4.31811 14.6666 1.33334 11.6819 1.33334 7.99998ZM7.33335 10.6095L11.6381 6.30473L10.6953 5.36192L7.33335 8.72385L5.47142 6.86192L4.52862 7.80473L7.33335 10.6095Z" fill="#CCC"/>
+</svg>

package/src/components/FileUploadTable/ysc.svg

@@ -1,3 +1,3 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.33334 8.00004C1.33334 4.31814 4.31811 1.33337 8.00001 1.33337C11.6819 1.33337 14.6667 4.31814 14.6667 8.00004C14.6667 11.6819 11.6819 14.6667 8.00001 14.6667C4.31811 14.6667 1.33334 11.6819 1.33334 8.00004ZM7.33335 10.6095L11.6381 6.30479L10.6953 5.36198L7.33335 8.72391L5.47142 6.86198L4.52862 7.80479L7.33335 10.6095Z" fill="#48D2A0"/>
-</svg>
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="design-iconfont">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.33334 8.00004C1.33334 4.31814 4.31811 1.33337 8.00001 1.33337C11.6819 1.33337 14.6667 4.31814 14.6667 8.00004C14.6667 11.6819 11.6819 14.6667 8.00001 14.6667C4.31811 14.6667 1.33334 11.6819 1.33334 8.00004ZM7.33335 10.6095L11.6381 6.30479L10.6953 5.36198L7.33335 8.72391L5.47142 6.86198L4.52862 7.80479L7.33335 10.6095Z" fill="#48D2A0"/>
+</svg>

package/src/components/HandlingAdvice/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :visible.sync="visible"
-      width="85%"
+      :width="width"
       :title="'提交意见' | $lc"
       @close="$emit('close')"
       @closed="$emit('closed')"
@@ -32,7 +32,7 @@
         </el-form-item>
       </el-form>
       <ExpandablePane v-if="otherAttDataA.length > 0" title="自定义项" :default-expand="true">
-        <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+        <el-form ref="approveBtnGroup" label-position="right" :label-width="labelWidth">
           <div
             class="p-b-lg p-t-lg p-r-lg"
             style="max-height: 350px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
@@ -43,6 +43,7 @@
               :other-att-data-a="otherAttDataA"
               :proc-inst-id="procInstId || this.$route.query.processInstanceId"
               :required="true"
+              :label-width="labelWidth"
             />
           </div>
         </el-form>
@@ -64,6 +65,14 @@ export default {
   name: 'HandlingAdvice',
   components: { ShowOtherAttNew, ExpandablePane },
   props: {
+    width: {
+      type: String,
+      default: '85%'
+    },
+    labelWidth: {
+      type: String,
+      default: '12em'
+    },
     afterGetConf: {
       type: Function,
       default: undefined

package/src/components/InputSearch/index.vue

@@ -115,14 +115,15 @@ export default {
       }
     },
     changeFn(val) {
+      // 只同步 input 事件，change 事件由 $listeners 处理
       this.$emit('input', val)
-      this.$emit('change', val)
     },
     searchFn() {
       this.$emit('search', this.value)
     },
     closeFn() {
       this.$emit('input', undefined)
+      // 清空时也触发 change
       this.$emit('change', undefined)
     }
   }

package/src/components/ProFilterView/advancedQuery.vue

@@ -48,7 +48,7 @@
               <!-- 字段选择 -->
               <el-select v-model="condition.field" class="field-select" placeholder="请选择字段" size="small">
                 <el-option
-                  v-for="field in filterList"
+                  v-for="field in canSetFilter"
                   :key="field.value"
                   :label="field.label"
                   :value="field.value"
@@ -457,12 +457,18 @@ export default {
     }
   },
   mounted() {
+    // 先基于 filterList 初始化 canSetFilter，避免闪烁
+    this.canSetFilter = this.filterList
+    // 立即过滤一次无效条件
+    this.filterInvalidConditions()
+    // 然后再发起异步请求获取更精确的字段配置
     this.getAdvancedQueryFields()
   },
   methods: {
     // 查询支持可配置高级查询的字段
     getAdvancedQueryFields() {
       axios.get('/bems/query/viewColumn/getColumnInfo', { bussId: this.bussId }, { loading: false }).then((res) => {
+        //res.data=[]
         // 过滤可筛选的字段，保留完整对象信息
         const searchableFields = res.data.filter((item) => {
           return item.searchable === '1'
@@ -486,9 +492,30 @@ export default {
             }
             return item
           })
-        console.log(this.canSetFilter, 'canSetFilter')
+        // 再次过滤，确保数据正确
+        this.filterInvalidConditions()
       })
     },
+    // 过滤掉无效的条件（字段不在可筛选列表中）
+    filterInvalidConditions() {
+      const validFieldValues = this.canSetFilter.map((item) => item.value)
+      this.value.forEach((group) => {
+        // 从后往前遍历，避免索引问题
+        for (let i = group.conditions.length - 1; i >= 0; i--) {
+          const condition = group.conditions[i]
+          if (condition.field && !validFieldValues.includes(condition.field)) {
+            group.conditions.splice(i, 1)
+          }
+        }
+      })
+      // 移除 conditions 为空数组的条件组
+      for (let i = this.value.length - 1; i >= 0; i--) {
+        if (this.value[i].conditions.length === 0) {
+          this.value.splice(i, 1)
+        }
+      }
+      this.$emit('update:value', this.value)
+    },
     // 修改字段
     updatefield(field, row) {
       this.$set(row, 'advancedQueryType', field.advancedQueryType)

package/src/components/ProFilterView/index.vue

@@ -138,6 +138,7 @@
         </cl-advanced-filter>
         <advancedQuery
           v-else
+          :key="visible"
           v-model="conditionGroups"
           :filter-list="filterList"
           :filter-id="filterId"

package/src/components/TablePro/index.vue

@@ -206,6 +206,10 @@ export default {
     isFiliterSingle: {
       type: Boolean,
       default: false
+    },
+    isAutoWidth: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -219,7 +223,11 @@ export default {
   },
   computed: {
     _columns() {
-      return this.calcColumnWidth(this.columns)
+      if (this.isAutoWidth) {
+        return this.calcColumnWidth(this.columns)
+      } else {
+        return this.columns
+      }
     }
   },
   watch: {
@@ -409,23 +417,22 @@ export default {
       function calc(columns) {
         // 计算所有列的基础宽度总和
         let totalBaseWidth = 0
-
         columns.forEach((column) => {
           if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
-            column.width = 80
+            column.width = 180
           }
           if (column.type === 'checkbox') {
-            column.width = 80
+            column.width = 50
           }
 
           // 如果没有设置宽度，根据字符数计算最小宽度
-          if (!column.width && !column.minWidth) {
+          if (!column.width && !column.minWidth && !column['min-width']) {
             const textLength = (column.label && column.label.length) || 10
             column.minWidth = Math.ceil(textLength * CHAR_WIDTH + PADDING)
           }
 
           // 计算基础宽度：有width的用width，没有的用minWidth
-          const widthValue = column.width || column.minWidth || 0
+          const widthValue = column.width || column.minWidth || column['min-width'] || 0
           // 处理不同格式的宽度：数字、"100"、"100px"
           let baseWidth = 0
           if (typeof widthValue === 'number') {
@@ -437,25 +444,17 @@ export default {
           column['_baseWidth_'] = baseWidth
           totalBaseWidth += baseWidth
         })
-
         // 如果所有列的基础宽度总和 >= 容器宽度，不做处理
         if (totalBaseWidth >= windowWidth) {
           return columns
-        }
-
-        // 否则，所有列都按比例扩展以撑满容器
-        const scaleRate = windowWidth / totalBaseWidth
-
-        columns.forEach((column) => {
-          if (!column.type && !column.isResize) {
-            // 按比例扩展列宽
-            column.width = column['_baseWidth_'] * scaleRate
+        } else {
+          const seqColumns = columns.filter((item) => item.type !== 'seq' && item.type !== 'checkbox')
+          if (seqColumns.length > 0) {
+            seqColumns[0].width = ''
           }
-        })
-
-        return columns
+          return columns
+        }
       }
-
       return calc(columns)
     }
   }