el-plus-crud 0.1.1 → 0.1.2

package/lib/components/el-plus-form/components/ElPlusFormBtns.vue

@@ -31,11 +31,13 @@ export default {
 }
 </script>
 <script lang="ts" setup>
-import { ref, computed, watch, onMounted } from 'vue'
+import { ref, computed, watch, onMounted, inject } from 'vue'
 import ElPlusFormBtn from './ElPlusFormBtn.vue'
 import ElPlusFormUpbtn from './ElPlusFormUpbtn.vue'
 import { ElMessageBox } from 'element-plus'
-import { IBtnBack } from 'types'
+import { IBtnBack, ICRUDConfig } from 'types'
+
+const defaultConf = inject('defaultConf') as ICRUDConfig
 
 const props = defineProps<{
   field?: string
@@ -106,12 +108,23 @@ const initBtnList = () => {
 }
 // 执行一次vif的处理
 const handelItemVIf = (formItem: any): Boolean => {
+  let _vif = true
   if (typeof formItem.vif === 'function') {
-    return Boolean(runFnGetData(formItem.vif))
+    _vif = Boolean(runFnGetData(formItem.vif))
   } else if (typeof formItem.vif === 'boolean') {
-    return formItem.vif
+    _vif = formItem.vif
+  }
+  if (_vif) {
+    // 这里最终处理一下auth权限问题
+    if (formItem?.auth) {
+      if (!defaultConf.auth) {
+        console.warn('使用auth属性，请在crud注册时传入auth校验方法~')
+      } else {
+        _vif = defaultConf.auth(formItem.auth)
+      }
+    }
   }
-  return true
+  return _vif
 }
 // 执行函数,获取相关数据
 const runFnGetData = (fn: Function) => {

package/lib/util/index.ts

@@ -234,7 +234,14 @@ export function handelListColumn(columnList: Array<IColumnItem> | undefined, def
         case 'btns':
           if (!item.minWidth && item.btns && item.btns.length >= 2) {
             let labelLength = 0
-            item.btns.map((item: any) => (labelLength += typeof item.label === 'string' ? item.label.length : 4))
+            // 这里判断最多按钮数量
+            for (let i = 0; i < item.btns.length && i < (item.limit || 3); i++) {
+              if (item.btns[i] && typeof item.btns[i].label === 'string') {
+                labelLength += (item.btns[i].label as string).length
+              } else {
+                labelLength += 4
+              }
+            }
             item.width = item.width || labelLength * 24 + 'px'
           }
           item.align = item.align || 'left'
@@ -264,39 +271,24 @@ export function handelListColumn(columnList: Array<IColumnItem> | undefined, def
  * @param tbName
  */
 export function handelVIf(item: IColumnItem, defaultConf: ICRUDConfig, tbName: string) {
-  if (tbName) {
-    if (item.vif !== undefined && item.vif !== null) {
-      if (typeof item.vif === 'function') {
-        item._vif = item.vif(item)
-      } else {
-        item._vif = !!item.vif
-      }
+  if (item.vif !== undefined && item.vif !== null) {
+    if (typeof item.vif === 'function') {
+      item._vif = item.vif(item)
     } else {
-      item._vif = true
+      item._vif = !!item.vif
     }
-    item.__vif = item.scShow && item._vif
   } else {
-    // 这里初始化一下vif
-    if (item.vif !== undefined && item.vif !== null) {
-      if (typeof item.vif === 'function') {
-        item._vif = item.vif(item)
-      } else {
-        item._vif = !!item.vif
-      }
+    item._vif = true
+  }
+  // 这里最终处理一下auth权限问题
+  if (item.auth) {
+    if (!defaultConf.auth) {
+      console.warn('使用auth属性，请在crud注册时传入auth校验方法~')
     } else {
-      item._vif = true
+      item._vif = defaultConf.auth(item.auth)
     }
-    // 这里最终处理一下auth权限问题
-    if (item.auth) {
-      if (!defaultConf.auth) {
-        console.warn('使用auth属性，请在crud注册时传入auth校验方法~')
-      } else {
-        item._vif = defaultConf.auth(item.auth)
-      }
-    }
-    item.__vif = item._vif
   }
-
+  item.__vif = tbName ? item.scShow && item._vif : item._vif
   // 这里要判断下下级显示状态, 如果下级全部隐藏了，那么本级也应该隐藏
   if (item.children && item.children.every((info) => !info.__vif)) {
     item.__vif = false

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",