wui-components-v2 1.1.75 → 1.1.77

package/components/card-botom-buttons/card-botom-buttons.vue

@@ -32,6 +32,7 @@ const props = defineProps<{
 const toast = useGlobalToast()
 const message = useGlobalMessage()
 const pageType = ref('')
+console.log(props, 'props')
 onLoad((option: any) => {
   pageType.value = option.type || ''
 })
@@ -40,13 +41,14 @@ const router = useRouter()
 // rowActions按钮
 const anctions = computed(() => {
   const rowActions = props.rowActions || []
+  console.log([...rowActions.filter(isShowAction)], 1111111111111111)
   return [...rowActions.filter(isShowAction)]
 })
 
 // raction按钮
 const ractions = computed(() => {
-  const ractions = props.ractions || []
-  return [...ractions.filter(isShowAction)]
+  const list = props.ractions || []
+  return list.filter(isShowAction)
 })
 
 // actions按钮
@@ -90,8 +92,7 @@ async function action(subitem: rowActions) {
       props.zpaging.reload()
       toast.success({ msg: '操作成功！' })
     } catch (error: any) {
-      toast.error(error)
-      console.log(error)
+      console.log(error, 1111111)
     }
   }
 }

package/components/form-control/form-control.vue

@@ -222,14 +222,35 @@ const schema = computed((): FormSchema => {
     validate(_model: Record<string, any>): FormSchemaIssue[] {
       const issues: FormSchemaIssue[] = []
       props.fieldGroup?.fields.forEach((item: Fields) => {
+        const value = _model[item.sourceId]
+        // 必填校验
         if (item.required) {
-          const value = _model[item.sourceId]
           if (Array.isArray(value) && value.length < 1) {
             issues.push({ path: [item.sourceId], message: `请填写${item.title}` })
           } else if (!value) {
             issues.push({ path: [item.sourceId], message: `请填写${item.title}` })
           }
         }
+        // 自定义规则校验（item.rules: { message, pattern }）
+        if (item.rules) {
+          const ruleList = Array.isArray(item.rules) ? item.rules : [item.rules]
+          const val = Array.isArray(value) ? value.join(',') : value
+          // 空值交给 required 处理，避免重复报错
+          if (val !== undefined && val !== null && val !== '') {
+            for (const rule of ruleList) {
+              if (rule.pattern) {
+                const pattern = typeof rule.pattern === 'string' ? new RegExp(rule.pattern) : rule.pattern
+                if (!pattern.test(String(val))) {
+                  issues.push({
+                    path: [item.sourceId],
+                    message: rule.message || `${item.title}格式不正确`,
+                  })
+                  break
+                }
+              }
+            }
+          }
+        }
       })
       return issues
     },

package/components/search/search.vue

@@ -118,7 +118,7 @@ function handleSubmit() {
   top: 5px;
   bottom: 5px;
 }
-::deep(.icon-arrow) {
+:deep(.icon-arrow) {
   display: inline-block;
   font-size: 20px;
   vertical-align: middle;

package/components/wui-edit-page/wui-edit-page.vue

@@ -3,11 +3,13 @@ import { computed, defineOptions, onBeforeMount, onUnmounted, ref, toRaw } from
 import { onLoad } from '@dcloudio/uni-app'
 import { useRouter } from 'uni-mini-router'
 import FormControl from '../form-control/form-control.vue'
-import { addPageConfig, editPageConfig, editPageDataSave, enums, selectDatas } from '../../api/page'
-import type { Entities, Enums, Groups, dtmplConfig } from '../../type'
+import { addPageConfig, editPageConfig, editPageDataSave, enums, selectDatas, actionDataSave } from '../../api/page'
+import type { Entities, Enums, Groups, dtmplConfig, rowActions, Fields } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
+import { useGlobalMessage } from '../../composables/useGlobalMessage'
 import foldCard from '../fold-card/fold-card.vue'
-import { generateHighResolutionID } from '../../utils/index'
+import ActionPopup from '../action-popup/action-popup.vue'
+import { generateHighResolutionID, comparator } from '../../utils/index'
 import TreeSelectControl from '../tree-select/index.vue'
 import batchUploadFile from '../batch-upload-file/batch-upload-file.vue'
 
@@ -28,11 +30,13 @@ const pageConfig = ref<dtmplConfig>({
     fieldMap: {},
   },
   buttons: [],
+  action: [],
   smartPaste: false,
 })
 const tree = ref({ value: '', sourceId: '' })
 const loading = ref(false)
 const globalToast = useGlobalToast()
+const message = useGlobalMessage()
 const router = useRouter()
 const mainCode = ref('')
 const id = ref('')
@@ -42,7 +46,7 @@ const subLoading = ref(false)
 const Enumcolumn = ref<Enums | undefined>()
 const pageTitle = ref('')
 const pageType = ref('')
-const selectData = ref<{ [key: string]: { loading: boolean, data: string[] } }>({})
+const selectData = ref<{ [key: string]: { loading: boolean; data: string[] } }>({})
 const rowData = ref<{ [key: string]: { [key: string]: any } }>({})
 const action = ref('')
 const hydrocarbonProgramToken = ref('')
@@ -54,7 +58,7 @@ const addEvent = ref('')
 const editEvent = ref('')
 const rowAddEvent = ref('')
 const sendRowAddEvent = ref('')
-const smartPaste=ref(false)
+const smartPaste = ref(false)
 // 折叠面板
 const collapses = ref('')
 const groupsformat = computed(() => {
@@ -62,9 +66,26 @@ const groupsformat = computed(() => {
     return item.displayConfig.includes('displayed')
   })
 })
-const canSmartPaste=computed(()=>{
-  return pageConfig.value?.smartPaste??false
+const canSmartPaste = computed(() => {
+  return pageConfig.value?.smartPaste ?? false
 })
+// 保存按钮旁的动态操作按钮（循环展示）；兼容后端返回的 action / actions 字段名
+const pageActions = computed(() => {
+  const cfg = pageConfig.value as dtmplConfig & { actions?: rowActions[] }
+  return cfg.action || cfg.actions || []
+})
+
+// 参考 card-botom-buttons 的 isShowAction：根据前置条件(preposes)判断动态按钮是否禁用
+function isActionDisabled(item: rowActions): boolean {
+  const fieldMap = (pageConfig.value.entity && pageConfig.value.entity.fieldMap) || {}
+  if (item.preposes && item.preposes.length > 0) {
+    return !item.preposes.every((prepose: Fields) => {
+      return comparator(prepose.comparator || 'equal', fieldMap[prepose.sourceId], prepose.defaultValue)
+    })
+  }
+  return false
+}
+console.log(pageActions.value, 'pageActions.value')
 onLoad((option: any) => {
   sourceId.value = option.sourceId
   mainCode.value = option.mainCode || ''
@@ -108,6 +129,7 @@ async function getEditPageConfig() {
           fieldMap: {},
         },
         buttons: [],
+        action: [],
       }
       getEnums()
       uni.$off(sendRowAddEvent.value)
@@ -125,44 +147,50 @@ async function getEditPageConfig() {
     loading.value = true
     if (id.value) {
       res = await editPageConfig(sourceId.value, id.value)
-    }
-    else {
+    } else {
       res = await addPageConfig(sourceId.value)
+      console.log(res, 'res')
     }
     loading.value = false
     // 初始化折叠面板
-      if (res.dtmplConfig) {
-        uni.setNavigationBarTitle({
-          title: `${res.dtmplConfig.title}`,
-        })
-        pageConfig.value = res.dtmplConfig
-        const visibleGroups = pageConfig.value.groups.filter((item: Groups) => item.displayConfig.includes('displayed'))
-        collapses.value = visibleGroups.length > 0 ? visibleGroups[0].id : ''
+    if (res.dtmplConfig) {
+      uni.setNavigationBarTitle({
+        title: `${res.dtmplConfig.title}`,
+      })
+      pageConfig.value = res.dtmplConfig
+      const visibleGroups = pageConfig.value.groups.filter((item: Groups) => item.displayConfig.includes('displayed'))
+      collapses.value = visibleGroups.length > 0 ? visibleGroups[0].id : ''
 
       pageConfig.value.groups.forEach((item: Groups) => {
         // 初始化勾选数据
         if (item.type === 'relation' && (item.buttons.includes('dtmplAdd') || item.buttons.includes('selectAdd'))) {
           selectData.value[item.id] = {
-            data: (pageConfig.value.entity && pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
-              return `${sebitem.code}`
-            })) || [],
+            data:
+              (pageConfig.value.entity &&
+                pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
+                  return `${sebitem.code}`
+                })) ||
+              [],
             loading: false,
           }
         }
         // 初始化行数据
         if (item.type === 'relation' && item.buttons.includes('rowAdd')) {
-          rowData.value[item.id] = (pageConfig.value.entity && pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
-            return {
-              id: sebitem.code,
-              ...sebitem.fieldMap,
-            }
-          })) || []
+          rowData.value[item.id] =
+            (pageConfig.value.entity &&
+              pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
+                return {
+                  id: sebitem.code,
+                  ...sebitem.fieldMap,
+                }
+              })) ||
+            []
         }
       })
       getEnums()
+      console.log(pageConfig.value, 'pageConfig.value')
     }
-  }
-  catch (error) {
+  } catch (error) {
     loading.value = false
     console.log('error:', error)
   }
@@ -178,12 +206,10 @@ async function getEnums() {
         }
       })
     })
-    if (!params.length)
-      return
+    if (!params.length) return
     const res = await enums(params.join('&'))
     Enumcolumn.value = res.enumMap || {}
-  }
-  catch (error) {
+  } catch (error) {
     console.log('error:', error)
   }
 }
@@ -195,130 +221,210 @@ async function rowAddSave(all: any) {
   uni.$emit(rowAddEvent.value, all)
 }
 
-// 保存
-async function save() {
+// 保存数据并返回保存后的实体编码；行添加场景会在内部直接处理跳转
+async function saveData(): Promise<{ entityCode: string; data: Record<string, any> }> {
   // 判断是否为树添加
   if (pageType.value === '树' && !tree.value.value) {
-    return globalToast.warning('请选择分组')
+    globalToast.warning('请选择分组')
+    throw new Error('请选择分组')
   }
 
-  try {
-    const formArray: any[] = []
-    formControlRef.value.forEach((element: any) => {
-      formArray.push(element.submit())
-    })
-    const res = await Promise.all(formArray)
-    const beasData = res.reduce((acc, cur) => {
-      return { ...acc, ...cur }
-    }, {})
-    subLoading.value = true
-
-    /**
-     *
-     * 421639572264099847.$$flag$$:true
-       421639572264099847[0].$$relation$$:拥有角色
-       421639572264099847[0].唯一编码:448591711817211909
-     */
-    let all: Record<string, any> = {}
-    for (const key in selectData.value) {
-      if (Object.prototype.hasOwnProperty.call(selectData.value, key)) {
-        const element = selectData.value[key].data
-        if (element) {
-          all[`${key}.$$flag$$`] = true
-          element.forEach((item, index) => {
-            all[`${key}[${index}].$$relation$$`] = pageConfig.value.groups.find(item => item.id === key)?.relationNames[0]
-            if (typeof item === 'string') {
-              all[`${key}[${index}].唯一编码`] = item.split('@R@')[0]
-            }
-          })
-        }
+  const formArray: any[] = []
+  formControlRef.value.forEach((element: any) => {
+    formArray.push(element.submit())
+  })
+  const res = await Promise.all(formArray)
+  const beasData = res.reduce((acc, cur) => {
+    return { ...acc, ...cur }
+  }, {})
+  subLoading.value = true
+
+  /**
+   *
+   * 421639572264099847.$$flag$$:true
+     421639572264099847[0].$$relation$$:拥有角色
+     421639572264099847[0].唯一编码:448591711817211909
+   */
+  let all: Record<string, any> = {}
+  for (const key in selectData.value) {
+    if (Object.prototype.hasOwnProperty.call(selectData.value, key)) {
+      const element = selectData.value[key].data
+      if (element) {
+        all[`${key}.$$flag$$`] = true
+        element.forEach((item, index) => {
+          all[`${key}[${index}].$$relation$$`] = pageConfig.value.groups.find(item => item.id === key)?.relationNames[0]
+          if (typeof item === 'string') {
+            all[`${key}[${index}].唯一编码`] = item.split('@R@')[0]
+          }
+        })
       }
     }
-    console.log('rowData.value', rowData.value)
-    for (const key in rowData.value) {
-      if (Object.prototype.hasOwnProperty.call(rowData.value, key)) {
-        const element1 = rowData.value[key]
-        if (element1) {
-          all[`${key}.$$flag$$`] = true
-          element1.forEach((item: any, index: any) => {
-            all[`${key}[${index}].$$relation$$`] = pageConfig.value.groups.find(item => item.id === key)?.relationNames[0]
-            all[`${key}[${index}].唯一编码`] = item.id
-
-            for (const key1 in item) {
-              if (Object.prototype.hasOwnProperty.call(item, key1)) {
-                console.log('item[key1]', item[key1])
-                if (item[key1] && item[key1].response) {
-                  all[`${key}[${index}].${key1}`] = JSON.stringify({
-                    valid: item[key1].disabled ? 'old' : 'new',
-                    fileKey: JSON.parse(item[key1].response).fileKey,
-                    fileName: item[key1].name,
-                  })
-                }
+  }
+  console.log('rowData.value', rowData.value)
+  for (const key in rowData.value) {
+    if (Object.prototype.hasOwnProperty.call(rowData.value, key)) {
+      const element1 = rowData.value[key]
+      if (element1) {
+        all[`${key}.$$flag$$`] = true
+        element1.forEach((item: any, index: any) => {
+          all[`${key}[${index}].$$relation$$`] = pageConfig.value.groups.find(item => item.id === key)?.relationNames[0]
+          all[`${key}[${index}].唯一编码`] = item.id
+
+          for (const key1 in item) {
+            if (Object.prototype.hasOwnProperty.call(item, key1)) {
+              console.log('item[key1]', item[key1])
+              if (item[key1] && item[key1].response) {
+                all[`${key}[${index}].${key1}`] = JSON.stringify({
+                  valid: item[key1].disabled ? 'old' : 'new',
+                  fileKey: JSON.parse(item[key1].response).fileKey,
+                  fileName: item[key1].name,
+                })
+              }
 
-                if (typeof item[key1] === 'string') {
-                  // all[`${key}[${index}].${key1}`] = item[key1].split('@R@')[0]
-                  all[`${key}[${index}].${key1}`] = item[key1]
-                }
+              if (typeof item[key1] === 'string') {
+                // all[`${key}[${index}].${key1}`] = item[key1].split('@R@')[0]
+                all[`${key}[${index}].${key1}`] = item[key1]
               }
             }
-          })
-        }
+          }
+        })
       }
     }
-    console.log('all', all, beasData)
-    all = {
-      ...all,
-      ...beasData,
-    }
+  }
+  console.log('all', all, beasData)
+  all = {
+    ...all,
+    ...beasData,
+  }
 
-    // 判断是否为行添加
-    if (rowAddEvent.value) {
-      subLoading.value = false
-      return rowAddSave({ ...all, id: pageConfig.value.entity.code })
-    }
+  // 判断是否为行添加
+  if (rowAddEvent.value) {
+    subLoading.value = false
+    rowAddSave({ ...all, id: pageConfig.value.entity.code })
+    return { entityCode: pageConfig.value.entity.code, data: all }
+  }
 
-    const newAll: Record<string, any> = {}
+  const newAll: Record<string, any> = {}
 
-    for (const key1 in all) {
-      if (Object.prototype.hasOwnProperty.call(all, key1)) {
-        if (all[key1] && all[key1].response) {
-          newAll[`${key1}`] = JSON.stringify({
-            valid: all[key1].disabled ? 'old' : 'new',
-            fileKey: JSON.parse(all[key1].response).fileKey,
-            fileName: all[key1].name,
-          })
-        }
-        else {
-          newAll[key1] = all[key1]
-        }
+  for (const key1 in all) {
+    if (Object.prototype.hasOwnProperty.call(all, key1)) {
+      if (all[key1] && all[key1].response) {
+        newAll[`${key1}`] = JSON.stringify({
+          valid: all[key1].disabled ? 'old' : 'new',
+          fileKey: JSON.parse(all[key1].response).fileKey,
+          fileName: all[key1].name,
+        })
+      } else {
+        newAll[key1] = all[key1]
       }
     }
+  }
+
+  const saveRes: any = await editPageDataSave(
+    tree.value.sourceId || sourceId.value,
+    id.value,
+    newAll,
+    tree.value.value || mainCode.value
+  )
+  return { entityCode: saveRes.entityCode, data: newAll }
+}
+
+// 保存
+async function save() {
+  try {
+    const { entityCode, data } = await saveData()
+    // 行添加场景已在 saveData 内完成跳转
+    if (rowAddEvent.value) return
+    // 发送事件
+    if (addEvent.value) uni.$emit(addEvent.value, { entityCode, data })
+    if (editEvent.value) uni.$emit(editEvent.value, entityCode)
+
+    // ★ 通知 wui-select-popup 刷新列表数据
+    uni.$emit('selectPopup:refresh', sourceId.value)
+
+    subLoading.value = false
+    router.back()
+  } catch (error) {
+    subLoading.value = false
+    console.log('error:', error)
+  }
+}
+
+// 底部动态操作按钮（保存旁）相关数据
+const actionItem = ref<Groups>()
+const actionItemShow = ref(false)
+const actionCode = ref('')
+// ActionPopup 成功后的刷新处理（编辑页无 zpaging，直接返回上一页）
+const actionZpaging = { reload: () => router.back() }
+
+// 执行底部动态操作按钮：直接走 action 接口（不提交表单）
+async function executeAction(subitem: rowActions) {
+  if (subLoading.value) return
+  // 行添加场景无已保存实体，无法执行 action
+  if (rowAddEvent.value) {
+    globalToast.warning('请先保存后再操作')
+    return
+  }
+  // action 需要已保存实体的编码（编辑场景为 id）
+  const code = id.value
+  if (!code) {
+    globalToast.warning('请先保存后再操作')
+    return
+  }
+  actionCode.value = code
+  runAction(subitem)
+}
 
-    editPageDataSave(tree.value.sourceId || sourceId.value, id.value, newAll, tree.value.value || mainCode.value).then((res: any) => {
-      // 发送事件
-      if (addEvent.value)
-        uni.$emit(addEvent.value, { entityCode: res.entityCode, data: newAll })
-      if (editEvent.value)
-        uni.$emit(editEvent.value, res.entityCode)
-
-      // ★ 通知 wui-select-popup 刷新列表数据
-      uni.$emit('selectPopup:refresh', sourceId.value)
-
-      subLoading.value = false
-      router.back()
-    }).catch((error: any) => {
-      subLoading.value = false
-      globalToast.error(error.message)
+// 执行 action：带二次确认则先确认，再提交
+function runAction(subitem: rowActions) {
+  if (subitem.beforeExeConfirm) {
+    message.confirm({
+      msg: subitem.beforeExeConfirm,
+      title: '提示',
+      success: () => doAction(subitem),
     })
+    return
   }
-  catch (error) {
-    console.log('error:', error)
+  doAction(subitem)
+}
+
+// 提交 action：含写入项则弹窗录入，否则直接调用 action 接口
+async function doAction(subitem: rowActions) {
+  if (subitem.writes && subitem.writes.length) {
+    actionItem.value = {
+      id: subitem.id,
+      title: subitem.title,
+      type: '',
+      buttons: [],
+      fields: subitem.writes,
+      pointSourceId: '',
+      mstrucId: '',
+      relationNames: [],
+      readOnly: false,
+      displayConfig: [],
+    }
+    actionItemShow.value = true
+    return
+  }
+  try {
+    subLoading.value = true
+    await actionDataSave(subitem.id, actionCode.value, {})
+    subLoading.value = false
+    globalToast.success({ msg: '操作成功！' })
+    // 通知列表/弹窗刷新
+    uni.$emit('selectPopup:refresh', sourceId.value)
+    router.back()
+  } catch (error: any) {
+    subLoading.value = false
+    globalToast.error(error)
   }
 }
 
 // 跳转勾选页面
 function gotoSlect(group: Groups) {
-  router.push(`/pages/select-list/index?sourceId=${group.id}&title=${pageTitle.value}&selectEvent=${SELECTEVENT}&sendSelectEvent=${SENDSELECTEVENT}&extControlType=${''}&cardModel=complex`)
+  router.push(
+    `/pages/select-list/index?sourceId=${group.id}&title=${pageTitle.value}&selectEvent=${SELECTEVENT}&sendSelectEvent=${SENDSELECTEVENT}&extControlType=${''}&cardModel=complex`
+  )
   // 发送数据给选择页面,延迟发送防止页面不刷新
   setTimeout(() => {
     console.log('selectData:', selectData.value)
@@ -344,14 +450,12 @@ async function getSelectData(data: any, relationID: string) {
     const res = await selectDatas(relationID, codes)
     if (pageConfig.value.entity) {
       pageConfig.value.entity.arrayMap[relationID] = res.entities
-    }
-    else {
+    } else {
       pageConfig.value.entity = { arrayMap: { [relationID]: res.entities }, code: '', fieldMap: {} }
     }
 
     selectData.value[relationID].loading = false
-  }
-  catch (error) {
+  } catch (error) {
     console.log('error:', error)
   }
 }
@@ -361,10 +465,7 @@ async function getAddData(data: any, relationID: string) {
   addEvent.value = ''
   try {
     let codes = ''
-    selectData.value[relationID].data = [
-      ...data,
-      ...selectData.value[relationID].data,
-    ]
+    selectData.value[relationID].data = [...data, ...selectData.value[relationID].data]
     selectData.value[relationID].data.forEach((item: any) => {
       codes += `codes=${item}&`
     })
@@ -373,18 +474,15 @@ async function getAddData(data: any, relationID: string) {
     if (pageConfig.value.entity) {
       if (pageConfig.value.entity.arrayMap) {
         pageConfig.value.entity.arrayMap[relationID] = res.entities
-      }
-      else {
+      } else {
         pageConfig.value.entity.arrayMap = { [relationID]: res.entities }
       }
-    }
-    else {
+    } else {
       pageConfig.value.entity = { arrayMap: { [relationID]: res.entities }, code: '', fieldMap: {} }
     }
 
     selectData.value[relationID].loading = false
-  }
-  catch (error) {
+  } catch (error) {
     console.log('error:', error)
   }
 }
@@ -401,8 +499,7 @@ async function getEditData(data: any, relationID: string) {
     const res = await selectDatas(relationID, codes)
     pageConfig.value.entity.arrayMap[relationID] = res.entities
     selectData.value[relationID].loading = false
-  }
-  catch (error) {
+  } catch (error) {
     console.log('error:', error)
   }
 }
@@ -420,7 +517,9 @@ function gotoAdd(group: Groups) {
 // 跳转编辑页面
 function edit(group: Groups, field: Entities) {
   const editEvent = generateHighResolutionID()
-  router.push(`/pages/edit-page/index?sourceId=${group.id}&id=${field.code}&title=${group.title}&editEvent=${editEvent}`)
+  router.push(
+    `/pages/edit-page/index?sourceId=${group.id}&id=${field.code}&title=${group.title}&editEvent=${editEvent}`
+  )
   // 接收编辑页面发送过来的数据
   uni.$once(editEvent, (data: any) => {
     uni.$off(editEvent)
@@ -432,7 +531,9 @@ function edit(group: Groups, field: Entities) {
 function gotoRowAdd(group: Groups) {
   const rowAddEvent = generateHighResolutionID()
   const sendRowAddEvent = generateHighResolutionID()
-  router.push(`/pages/edit-page/index?sourceId=${group.id}&id=&title=${group.title}&rowAddEvent=${rowAddEvent}&sendRowAddEvent=${sendRowAddEvent}`)
+  router.push(
+    `/pages/edit-page/index?sourceId=${group.id}&id=&title=${group.title}&rowAddEvent=${rowAddEvent}&sendRowAddEvent=${sendRowAddEvent}`
+  )
   // 发送数据给行添加页面
   setTimeout(() => {
     // groups: conf.groups,
@@ -459,12 +560,13 @@ function gotoRowAdd(group: Groups) {
         ...newData,
         id,
       })
-    }
-    else {
-      rowData.value[group.id] = [{
-        ...newData,
-        id,
-      }]
+    } else {
+      rowData.value[group.id] = [
+        {
+          ...newData,
+          id,
+        },
+      ]
     }
 
     console.log(pageConfig.value.entity)
@@ -477,34 +579,36 @@ function gotoRowAdd(group: Groups) {
           ...data,
         },
       })
-    }
-    else {
+    } else {
       if (pageConfig.value.entity && pageConfig.value.entity.arrayMap) {
         pageConfig.value.entity = {
           arrayMap: {
             ...pageConfig.value.entity.arrayMap,
-            [group.id]: [{
-              arrayMap: {},
-              code: id,
-              fieldMap: {
-                ...data,
+            [group.id]: [
+              {
+                arrayMap: {},
+                code: id,
+                fieldMap: {
+                  ...data,
+                },
               },
-            }],
+            ],
           },
           code: id,
           fieldMap: {},
         }
-      }
-      else {
+      } else {
         pageConfig.value.entity = {
           arrayMap: {
-            [group.id]: [{
-              arrayMap: {},
-              code: id,
-              fieldMap: {
-                ...data,
+            [group.id]: [
+              {
+                arrayMap: {},
+                code: id,
+                fieldMap: {
+                  ...data,
+                },
               },
-            }],
+            ],
           },
           code: id,
           fieldMap: {},
@@ -521,7 +625,9 @@ function gotoRowAdd(group: Groups) {
 function rowEdit(group: Groups, field: Entities) {
   const rowAddEvent = generateHighResolutionID()
   const sendRowAddEvent = generateHighResolutionID()
-  router.push(`/pages/edit-page/index?sourceId=${group.id}&id=&title=${group.title}&rowAddEvent=${rowAddEvent}&sendRowAddEvent=${sendRowAddEvent}`)
+  router.push(
+    `/pages/edit-page/index?sourceId=${group.id}&id=&title=${group.title}&rowAddEvent=${rowAddEvent}&sendRowAddEvent=${sendRowAddEvent}`
+  )
   // 发送数据给行编辑页面
   setTimeout(() => {
     // groups: conf.groups,
@@ -581,14 +687,16 @@ function rowEdit(group: Groups, field: Entities) {
  */
 function canClick(group: Groups) {
   if (group.max) {
-    if (pageConfig.value.entity && pageConfig.value.entity.arrayMap[group.id] && pageConfig.value.entity.arrayMap[group.id].length >= group.max) {
+    if (
+      pageConfig.value.entity &&
+      pageConfig.value.entity.arrayMap[group.id] &&
+      pageConfig.value.entity.arrayMap[group.id].length >= group.max
+    ) {
       return true
-    }
-    else {
+    } else {
       return false
     }
-  }
-  else {
+  } else {
     return false
   }
 }
@@ -599,17 +707,23 @@ function canClick(group: Groups) {
 function remove(group: Groups, field: Entities) {
   // 行编辑数据
   if (rowData.value[group.id]) {
-    rowData.value[group.id] = rowData.value[group.id].filter((item: any) => item.id !== (field.code || field.fieldMap.id))
+    rowData.value[group.id] = rowData.value[group.id].filter(
+      (item: any) => item.id !== (field.code || field.fieldMap.id)
+    )
   }
 
   // 显示数据
   if (pageConfig.value.entity.arrayMap[group.id]) {
-    pageConfig.value.entity.arrayMap[group.id] = pageConfig.value.entity.arrayMap[group.id].filter((item: any) => (item.code || item.fieldMap.id) !== (field.code || field.fieldMap.id))
+    pageConfig.value.entity.arrayMap[group.id] = pageConfig.value.entity.arrayMap[group.id].filter(
+      (item: any) => (item.code || item.fieldMap.id) !== (field.code || field.fieldMap.id)
+    )
   }
 
   // 行选择数据
   if (selectData.value[group.id]) {
-    selectData.value[group.id].data = selectData.value[group.id].data.filter((item: any) => item.split('@R@')[0] !== field.code)
+    selectData.value[group.id].data = selectData.value[group.id].data.filter(
+      (item: any) => item.split('@R@')[0] !== field.code
+    )
   }
 
   console.log(rowData.value[group.id], field, '删除行数据')
@@ -619,28 +733,26 @@ function remove(group: Groups, field: Entities) {
  */
 function handleFileChange(e: any, group: Groups) {
   console.log(e, group)
-  const newData: { [key: string]: any } = {
+  const newData: { [key: string]: any } = {}
 
-  }
-
-  group.fields.forEach((item) => {
+  group.fields.forEach(item => {
     newData[item.sourceId] = ''
   })
   const id = generateHighResolutionID()
-  if (group.batchAddFileField)
-    newData[group.batchAddFileField?.sourceId] = e.file
+  if (group.batchAddFileField) newData[group.batchAddFileField?.sourceId] = e.file
 
   if (rowData.value[group.id]) {
     rowData.value[group.id].push({
       ...newData,
       id,
     })
-  }
-  else {
-    rowData.value[group.id] = [{
-      ...newData,
-      id,
-    }]
+  } else {
+    rowData.value[group.id] = [
+      {
+        ...newData,
+        id,
+      },
+    ]
   }
 
   // 显示数据
@@ -652,34 +764,36 @@ function handleFileChange(e: any, group: Groups) {
         ...newData,
       },
     })
-  }
-  else {
+  } else {
     if (pageConfig.value.entity && pageConfig.value.entity.arrayMap) {
       pageConfig.value.entity = {
         arrayMap: {
           ...pageConfig.value.entity.arrayMap,
-          [group.id]: [{
-            arrayMap: {},
-            code: id,
-            fieldMap: {
-              ...newData,
+          [group.id]: [
+            {
+              arrayMap: {},
+              code: id,
+              fieldMap: {
+                ...newData,
+              },
             },
-          }],
+          ],
         },
         code: id,
         fieldMap: {},
       }
-    }
-    else {
+    } else {
       pageConfig.value.entity = {
         arrayMap: {
-          [group.id]: [{
-            arrayMap: {},
-            code: id,
-            fieldMap: {
-              ...newData,
+          [group.id]: [
+            {
+              arrayMap: {},
+              code: id,
+              fieldMap: {
+                ...newData,
+              },
             },
-          }],
+          ],
         },
         code: id,
         fieldMap: {},
@@ -687,6 +801,7 @@ function handleFileChange(e: any, group: Groups) {
     }
   }
 }
+console.log(pageConfig, 'props111')
 </script>
 
 <template>
@@ -697,15 +812,20 @@ function handleFileChange(e: any, group: Groups) {
     <view v-else>
       <wd-cell v-if="pageType === '树'" title="分组" title-width="100px">
         <TreeSelectControl
-          v-model="tree" select-mode="single" :source-id="sourceId" title="分组"
-          ext-control-type="relselect " :readonly="false" :clearable="false"
+          v-model="tree"
+          select-mode="single"
+          :source-id="sourceId"
+          title="分组"
+          ext-control-type="relselect "
+          :readonly="false"
+          :clearable="false"
         />
       </wd-cell>
       <wd-collapse v-model="collapses" accordion>
-        <wd-collapse-item v-for="group in groupsformat" :key="group.id"  :name="group.id">
+        <wd-collapse-item v-for="group in groupsformat" :key="group.id" :name="group.id">
           <template #title>
             <view class="flex items-center justify-between">
-              <view class="flex-1 flex items-center  justify-between pr-2">
+              <view class="flex-1 flex items-center justify-between pr-2">
                 <view>{{ group.title }}</view>
                 <view v-if="group.type === 'relation'">
                   <view v-if="selectData[group.id]?.loading" class="flex justify-center p-3">
@@ -715,22 +835,35 @@ function handleFileChange(e: any, group: Groups) {
                     <view v-if="!group.readOnly" class="w-upload flex justify-center gap-2">
                       <batchUploadFile
                         v-if="group.batchAddFileField && group.batchAddFileField.extControlType === 'file'"
-                        @handle-file-change="(e) => { handleFileChange(e, group) }"
+                        @handle-file-change="
+                          e => {
+                            handleFileChange(e, group)
+                          }
+                        "
                       />
                       <wd-button
-                        v-if="group.buttons.includes('selectAdd')" :disabled="canClick(group)" type="info"
-                        size="small" @click.stop="gotoSlect(group)"
+                        v-if="group.buttons.includes('selectAdd')"
+                        :disabled="canClick(group)"
+                        type="info"
+                        size="small"
+                        @click.stop="gotoSlect(group)"
                       >
                         选择
                       </wd-button>
                       <wd-button
-                        v-if="group.buttons.includes('dtmplAdd')" :disabled="canClick(group)" type="primary"
-                        size="small" @click.stop="gotoAdd(group)"
+                        v-if="group.buttons.includes('dtmplAdd')"
+                        :disabled="canClick(group)"
+                        type="primary"
+                        size="small"
+                        @click.stop="gotoAdd(group)"
                       >
                         新增
                       </wd-button>
                       <wd-button
-                        v-if="group.buttons.includes('rowAdd')" :disabled="canClick(group)" type="primary" size="small"
+                        v-if="group.buttons.includes('rowAdd')"
+                        :disabled="canClick(group)"
+                        type="primary"
+                        size="small"
                         @click.stop="gotoRowAdd(group)"
                       >
                         新增
@@ -744,8 +877,11 @@ function handleFileChange(e: any, group: Groups) {
           </template>
 
           <FormControl
-            v-if="group.type === 'fieldGroup'" ref="formControlRef" :field-group="group"
-            :entity="pageConfig?.entity?.fieldMap" :enum-column="Enumcolumn"
+            v-if="group.type === 'fieldGroup'"
+            ref="formControlRef"
+            :field-group="group"
+            :entity="pageConfig?.entity?.fieldMap"
+            :enum-column="Enumcolumn"
             :company-filter="props.companyFilter"
             :company-field-source-id="props.companyFieldSourceId"
             :smart-paste="canSmartPaste"
@@ -757,8 +893,13 @@ function handleFileChange(e: any, group: Groups) {
             <view v-else>
               <view v-for="(field, index) in pageConfig?.entity?.arrayMap[group.id]" :key="field.code">
                 <foldCard
-                  :index="index" :enum-column="{}" :groups="group" :source-id="sourceId" :columns="group.fields"
-                  model="complex" :data="field"
+                  :index="index"
+                  :enum-column="{}"
+                  :groups="group"
+                  :source-id="sourceId"
+                  :columns="group.fields"
+                  model="complex"
+                  :data="field"
                 >
                   <template v-if="!group.readOnly" #buttons>
                     <wd-button v-if="group.buttons.includes('dtmplEdit')" size="small" @click="edit(group, field)">
@@ -768,7 +909,9 @@ function handleFileChange(e: any, group: Groups) {
                       编辑
                     </wd-button>
                     <wd-button
-                      v-if="group.buttons.includes('singleDelete')" type="danger" size="small"
+                      v-if="group.buttons.includes('singleDelete')"
+                      type="danger"
+                      size="small"
                       @click="remove(group, field)"
                     >
                       删除
@@ -781,11 +924,29 @@ function handleFileChange(e: any, group: Groups) {
         </wd-collapse-item>
       </wd-collapse>
       <view class="h-12" />
-      <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 bg-white dark:bg-[var(--wot-dark-background)]">
-        <wd-button class="flex-1" :loading="subLoading" @click="save">
-          保存
+      <view
+        class="fixed bottom-0 left-0 right-0 box-border w-100% flex gap-2 p-2 bg-white dark:bg-[var(--wot-dark-background)]"
+      >
+        <wd-button
+          v-for="subitem in pageActions"
+          :key="subitem.id"
+          class="flex-1"
+          :loading="subLoading"
+          :disabled="isActionDisabled(subitem)"
+          plain
+          @click="executeAction(subitem)"
+        >
+          {{ subitem.title }}
         </wd-button>
+        <wd-button class="flex-1" :loading="subLoading" @click="save">保存</wd-button>
       </view>
+      <ActionPopup
+        v-model:show="actionItemShow"
+        :enum-column="Enumcolumn"
+        :zpaging="actionZpaging"
+        :field-group="actionItem"
+        :code="actionCode"
+      />
     </view>
   </view>
 </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.75",
+  "version": "1.1.77",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",

package/type.ts

@@ -74,6 +74,12 @@ export interface PageData {
   entities: Entities[]
 }
 
+// 字段自定义校验规则（如 { message, pattern }）
+export interface FieldRule {
+  message?: string | null
+  pattern?: string | RegExp
+}
+
 // 表单字段配置
 export interface Fields extends Columns {
   disabled: boolean
@@ -85,6 +91,7 @@ export interface Fields extends Columns {
   max?: string
   min?: string
   comparator?: Comparator
+  rules?: FieldRule | FieldRule[]
 }
 
 // 编辑按钮配置
@@ -125,6 +132,8 @@ export interface dtmplConfig {
   groups: Groups[]
   entity: Entity
   buttons: string[]
+  /** 底部动态操作按钮（保存旁），循环展示 */
+  action?: rowActions[]
 }
 // 枚举项
 export interface EnumItem {