af-mobile-client-vue3 1.3.84 → 1.3.86

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.84",
+  "version": "1.3.86",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/core/ImageUploader/index.vue

@@ -221,7 +221,7 @@ function handlePhotoUpload(photoData: any) {
     f_operator: 'server',
     imgPath: photoData.filePath,
     urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
-    commonId: parentData.commonId ?? '',
+    commonId: parentData.commonId.value ?? '',
   }
   if (props.isAsyncUpload) {
     // 添加上传队列

package/src/components/data/XCellList/index.vue

@@ -418,15 +418,50 @@ function splitArrayAt<T>(array: T[], index: number) {
 
 // 新增：动态获取按钮分组
 function getActionGroups(item: any, index: number) {
-  // 先过滤出当前行可见的按钮
-  const visibleActions = allActions.value.filter(action =>
-    evaluateCustomFunction(action.customFunction, item, index),
-  )
-  // 前3个为主按钮，其余为更多按钮，保持逆序
-  return {
-    main: visibleActions.slice(0, 3).reverse(),
-    more: visibleActions.slice(3).reverse(),
+  const main: any[] = []
+  const more: any[] = []
+  let mainCount = 0
+
+  // 遍历所有按钮，同时处理显示/隐藏和样式，避免多次遍历
+  for (const action of allActions.value) {
+    let visible = true
+    let buttonStyle = {}
+
+    // 处理有 customFunction 的按钮
+    if (action.customFunction) {
+      try {
+        const result = executeStrFunctionByContext(currInst, action.customFunction, [item, index])
+
+        if (typeof result === 'boolean') {
+          visible = result
+        }
+        else if (result && typeof result === 'object') {
+          visible = true
+          buttonStyle = result
+        }
+      }
+      catch (error) {
+        console.error('Error in getActionGroups customFunction:', error)
+        visible = false
+      }
+    }
+
+    // 只处理可见的按钮
+    if (visible) {
+      const processedAction = { ...action, buttonStyle }
+
+      // 直接分配到 main 或 more，避免后续的 slice 和 reverse 操作
+      if (mainCount < 3) {
+        main.unshift(processedAction) // 使用 unshift 实现逆序
+        mainCount++
+      }
+      else {
+        more.unshift(processedAction) // 使用 unshift 实现逆序
+      }
+    }
   }
+
+  return { main, more }
 }
 
 watch(() => searchValue.value, (newVal) => {
@@ -550,32 +585,6 @@ function handleButtonClick(btn, item) {
   emit(`${btn.btnIcon}`, item)
 }
 
-// 处理自定义函数
-function evaluateCustomFunction(funcString: string | undefined, record: any, index: number): boolean {
-  try {
-    // 如果 customFunction 不存在，返回 true 表示正常显示
-    if (!funcString || funcString === '')
-      return true
-
-    // 匹配参数名、函数体
-    const innerFuncRegex = /function\s*\((\w+)\s*,\s*(\w+)\)\s*\{([\s\S]*)\}/
-    const matches = funcString.match(innerFuncRegex)
-
-    if (!matches)
-      return true
-
-    const [, param1, param2, functionBody] = matches
-
-    // eslint-disable-next-line no-new-func
-    const func = new Function(param1, param2, functionBody)
-    return func(record, index)
-  }
-  catch (error) {
-    console.error('Error evaluating custom function:', error)
-    return true
-  }
-}
-
 /**
  * 函数描述： 传入自定义条件进行查询(传入字段必须在琉璃中配置生成查询项才会生效)
  * @param {string} params - 查询条件map 例: { os_id:1 }
@@ -988,7 +997,8 @@ function handleCheckboxChange(item: any, checked: boolean) {
                       <VanButton
                         v-for="button in getActionGroups(item, index).main"
                         :key="button.func"
-                        type="primary"
+                        :type="button.buttonStyle?.type || 'primary'"
+                        :color="button.buttonStyle?.color"
                         size="normal"
                         class="action-btn"
                         :disabled="isMultiSelectMode"