n20-common-lib 3.0.85 → 3.0.87

package/src/components/v3/TablePro/index.js

@@ -25,24 +25,23 @@ function flattenObject(obj, prefix = '', result = {}) {
   return result
 }
 
-vxeTable.setConfig({
-  size: 'small',
-  table: {
-    align: 'center',
-    columnConfig: {
-      resizable: true
-    }
-  },
-  // 对组件内置的提示语进行国际化翻译
-  i18n: (key, args) => {
-    return $lc(flattenObject(zhCN) && flattenObject(zhCN)[key])
-  }
-})
+// vxeTable.setConfig({
+//   size: 'small',
+//   table: {
+//     align: 'center',
+//     columnConfig: {
+//       resizable: true
+//     }
+//   },
+//   // 对组件内置的提示语进行国际化翻译
+//   i18n: (key, args) => {
+//     return $lc(flattenObject(zhCN) && flattenObject(zhCN)[key])
+//   }
+// })
 // 创建一个简单的输入框筛选
 vxeTable.renderer.add('FilterInput', {
   // 筛选模板
   renderFilter(h, renderOpts, params) {
-    console.log(h, renderOpts, params, 123)
     return <filterContent params={params}></filterContent>
   },
   // 不显示底部按钮，使用自定义的按钮
@@ -67,11 +66,6 @@ vxeTable.renderer.add('FilterInput', {
     return false
   }
 })
-vxeTable.renderer.add('customHeader', {
-  renderTableHeader(renderOpts, params) {
-    console.log(renderOpts, params, 123)
-  }
-})
 
 // 自定义全局的格式化处理函数
 vxeTable.formats.mixin({
@@ -127,33 +121,7 @@ vxeTable.formats.mixin({
     }
   }
 })
-// 创建一个简单的输入框筛选
-/* vxeTable.renderer.add('FilterInput', {
-  // 筛选模板
-  renderFilter(h, renderOpts, params) {
-    const { data } = params
-    return <el-input v-model='data' placeholder='' size='mini'></el-input>
-  },
-  // 重置数据方法
-  filterResetMethod({ options }) {
-    options.forEach((option) => {
-      option.data = ''
-    })
-  },
-  // 重置筛选复原方法（当未点击确认时，该选项将被恢复为默认值）
-  filterRecoverMethod({ option }) {
-    option.data = ''
-  },
-  // 筛选方法
-  filterMethod({ option, row, column }) {
-    const { data } = option
-    const cellValue = row[column.property]
-    if (cellValue) {
-      return cellValue.indexOf(data) > -1
-    }
-    return false
-  }
-}) */
+
 function install(Vue) {
   Vue.use(vxeTable)
 }

package/src/components/v3/TablePro/index.vue

@@ -252,14 +252,16 @@
             </div>
           </template>
           <!-- 处理旧格式 formatter 和 render -->
-          <template #default="{ row, column }">
+          <template v-if="item.type !== 'seq'" #default="{ row, column }">
             <!-- 纯对象字段 -->
             <template
               v-if="row[column.property] && typeof row[column.property] === 'object' && row[column.property].name"
             >
               {{ row[column.property].name }}
             </template>
-            <slot v-else :name="`cell_${item.prop}`" :row="row">{{ row[column.property] }}</slot>
+            <slot v-else :name="`cell_${item.prop}`" :row="row">{{
+              row[column.property] || row[column.property] === 0 ? row[column.property] : '--'
+            }}</slot>
           </template>
         </vxe-column>
       </template>
@@ -318,11 +320,19 @@
             :type="btn.type || 'primary'"
             :size="btn.size || 'mini'"
             :icon="btn.icon"
-            :disabled="btn.disabled"
+            :disabled="resolveDisabled(btn)"
             :class="[btn.class]"
             @click.stop="handleHoverBtnClick(btn, $event)"
           >
-            {{ btn.label }}
+            <el-badge
+              v-if="resolveBadge(btn)"
+              :value="resolveBadge(btn)"
+              :max="btn.badgeMax || 99"
+              class="hover-btn-badge"
+            >
+              {{ btn.label }}
+            </el-badge>
+            <template v-else>{{ btn.label }}</template>
           </el-button>
           <!-- 更多按钮下拉菜单 -->
           <el-dropdown
@@ -339,9 +349,14 @@
                 v-for="(btn, idx) in moreHoverBtns"
                 :key="'more-' + idx"
                 :command="btn"
-                :disabled="btn.disabled"
+                :disabled="resolveDisabled(btn)"
               >
-                <span :class="btn.type === 'danger' ? 'color-danger' : ''">
+                <el-badge v-if="resolveBadge(btn)" :value="resolveBadge(btn)" :max="btn.badgeMax || 99">
+                  <span :class="btn.type === 'danger' ? 'color-danger' : ''">
+                    {{ btn.label }}
+                  </span>
+                </el-badge>
+                <span v-else :class="btn.type === 'danger' ? 'color-danger' : ''">
                   {{ btn.label }}
                 </span>
               </el-dropdown-item>
@@ -771,6 +786,26 @@ export default {
         return isHas(row)
       }
     },
+    // 解析 badge 值，支持 number、string、function
+    resolveBadge(btn) {
+      if (!btn.badge) return null
+      if (typeof btn.badge === 'function') {
+        const val = btn.badge(this.hoverRowData)
+        return val || val === 0 ? val : null
+      }
+      return btn.badge
+    },
+    // 解析 disabled 值，支持 boolean 和 function
+    resolveDisabled(btn) {
+      if (btn.disabled === undefined || btn.disabled === null) {
+        return false
+      } else if (typeof btn.disabled === 'boolean') {
+        return btn.disabled
+      } else if (typeof btn.disabled === 'function') {
+        return btn.disabled(this.hoverRowData)
+      }
+      return false
+    },
     // 全选/反选
     toggleAllSelection() {
       if (!this.$refs.vxeTable) return
@@ -1156,7 +1191,7 @@ export default {
     },
     // 处理悬浮按钮点击
     handleHoverBtnClick(btn, $event) {
-      if (btn.disabled) return
+      if (this.resolveDisabled(btn)) return
 
       if (typeof btn.command === 'function') {
         btn.command(this.hoverRowData, this.hoverRowIndex, $event)
@@ -1173,7 +1208,7 @@ export default {
     },
     // 处理"更多"下拉菜单命令
     handleMoreBtnCommand(btn) {
-      if (!btn || btn.disabled) return
+      if (!btn || this.resolveDisabled(btn)) return
       this.handleHoverBtnClick(btn, null)
     },
     // 表格滚动时隐藏按钮组

package/src/index.js

@@ -6,6 +6,7 @@ import ProFilterView from './components/ProFilterView/index.vue'
 import AnchorItem from './components/Anchor/AnchorItem.vue'
 import Anchor from './components/Anchor/index.vue'
 import ApprovalButtons from './components/ApprovalButtons/index.vue'
+import ShowAppOpi from './components/ApprovalButtons/showAppOpi.vue'
 import ApproveCard from './components/ApprovalCard/ApproveCard.vue'
 import ApprovalCard from './components/ApprovalCard/index.vue'
 import ApprovalImg from './components/ApprovalRecord/approvalImg.vue'
@@ -190,6 +191,7 @@ const components = [
   ApproveCard,
   ApprovalRecord,
   ApprovalButtons,
+  ShowAppOpi,
   Expandable,
   ExpandablePane,
   Empty,
@@ -315,6 +317,7 @@ export {
   Anchor,
   AnchorItem,
   ApprovalButtons,
+  ShowAppOpi,
   ApprovalCard,
   /* 中建科 */
   ApprovalCardZjk,