af-mobile-client-vue3 1.2.12 → 1.2.14

package/package.json

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

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

@@ -717,7 +717,7 @@ defineExpose({
   flex-direction: column;
   --van-search-padding: 3px;
   --van-dropdown-menu-title-padding: 3px;
-  --van-cell-vertical-padding: 0px;
+  --van-cell-horizontal-padding: 0px;
   --van-text-color-2: rgb(75, 85, 99);
   --van-button-normal-font-size: 13px;
   .main {
@@ -822,7 +822,7 @@ defineExpose({
 
           .tag-item {
             width: auto;
-            font-size: var(--van-font-size-sm);
+            font-size: var(--van-font-size-md);
             margin: 4px 4px;
             :deep(.van-tag) {
               width: fit-content;

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

@@ -2,8 +2,10 @@
 import type { FormInstance } from 'vant'
 import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
 import XOlMap from '@af-mobile-client-vue3/components/data/XOlMap/index.vue'
-import { addOrModifyEntity } from '@af-mobile-client-vue3/services/api/common'
+import { formatDate } from '@af-mobile-client-vue3/hooks/useCommon'
+import { addOrModifyEntity, runLogic } from '@af-mobile-client-vue3/services/api/common'
 import { post } from '@af-mobile-client-vue3/services/restTools'
+import { useUserStore } from '@af-mobile-client-vue3/stores'
 import {
   showFailToast,
   showSuccessToast,
@@ -20,6 +22,11 @@ interface FormItem {
   model?: string
 }
 
+interface SilenceAddFormItem extends FormItem {
+  silencePurpose: string
+  silenceSource?: string
+}
+
 interface GroupFormItems {
   btnName?: string
   formJson: any[] // 根据实际类型调整
@@ -45,6 +52,7 @@ const props = withDefaults(defineProps<{
   submitButton: true,
 })
 const emits = defineEmits(['onSubmit'])
+const userStore = useUserStore()
 const formRef = ref<FormInstance>()
 const myFormItems = ref<FormItem[]>([])
 const rules = reactive({})
@@ -68,6 +76,16 @@ const realJsonData = computed(() => {
   })
 })
 
+// 是否处理表单Key值
+const isHandleFormKey = ref(true)
+
+// 过滤出用于静默新增场景的表单项
+const silenceAddJsonData = computed(() => {
+  return myFormItems.value.filter((item) => {
+    return item.addOrEdit === 'silenceAdd'
+  }) as SilenceAddFormItem[]
+})
+
 const resolvedSubmitButton = computed(() => {
   if (props.configName && internalSubmitButton.value !== undefined) {
     return internalSubmitButton.value
@@ -242,20 +260,128 @@ function setForm(obj) {
 }
 
 // 获取表单字段实际值
-function getRealKey(form) {
-  const result = {}
-  for (const key in form) {
-    result[key.substring(key.indexOf('_') + 1)] = form[key]
+function getRealKey(key, mustHandleKey = false) {
+  if (key === 'selected_id')
+    return key
+  if (isHandleFormKey.value || mustHandleKey) {
+    return key.substring(key.indexOf('_') + 1)
+  }
+  else {
+    return key
+  }
+}
+
+async function asyncSubmit() {
+  return new Promise((resolve, reject) => {
+    validate().then(async () => {
+      const requestForm = prepareForm()
+      await appendSilenceAddFields(requestForm)
+      const realForm = handleFormKeys(requestForm)
+      resolve({
+        realForm,
+        mode: props.mode,
+        serviceName: props.serviceName,
+        currUserName: userStore.getUserInfo().name,
+        currUserId: userStore.getUserInfo().id,
+        orgId: userStore.getUserInfo().orgid,
+      })
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
+
+function handleFormKeys(form, mustHandleKey = false) {
+  const realForm = {}
+  for (const key of Object.keys(form)) {
+    const value = form[key]
+    const extraFormKeyTagIndex = key.indexOf('@')
+    if (extraFormKeyTagIndex !== -1) {
+      const extraFormKey = key.substring(0, extraFormKeyTagIndex)
+      const realKey = key.substring(extraFormKeyTagIndex + 1)
+      if (!realForm[extraFormKey]) {
+        realForm[extraFormKey] = {}
+      }
+      realForm[extraFormKey][realKey] = value
+    }
+    else {
+      const realKey = isHandleFormKey.value || mustHandleKey ? getRealKey(key, mustHandleKey) : key
+      // 如果发生重名，不覆盖，把key的别名带上
+      if (realForm[realKey]) {
+        realForm[key] = value
+      }
+      else {
+        realForm[realKey] = value
+      }
+    }
+  }
+  return realForm
+}
+
+async function appendSilenceAddFields(form) {
+  if (props.mode === '新增') {
+    for (const item of silenceAddJsonData.value) {
+      switch (item.silencePurpose) {
+        case 'createTime':
+          form[item.model] = formatDate(new Date())
+          break
+        case 'operator':
+          form[item.model] = userStore.getUserInfo().name
+          break
+        case 'operatorId':
+          form[item.model] = userStore.getUserInfo().id
+          break
+        case 'orgId':
+          form[item.model] = userStore.getUserInfo().orgid
+          break
+        case 'orgName':
+          form[item.model] = userStore.getUserInfo().orgs
+          break
+        case 'depId':
+          form[item.model] = userStore.getUserInfo().depids
+          break
+        case 'depName':
+          form[item.model] = userStore.getUserInfo().deps
+          break
+      }
+    }
+    for (const item of silenceAddJsonData.value.filter(item => item.silencePurpose === 'customize')) {
+      const result: any = await runLogic(item.silenceSource, form, props.serviceName)
+      if (result) {
+        const keys = Object.keys(result)
+        if (keys.length === 1 && keys[0] === 'value') {
+          form[item.model] = result.value
+        }
+        else {
+          form[item.model] = result
+        }
+      }
+      else {
+        form[item.model] = result
+      }
+    }
+  }
+}
+
+function prepareForm() {
+  const formObj = { ...form.value }
+  for (const key of Object.keys(formObj)) {
+    const value = formObj[key]
+    if (value === null || (typeof value === 'object' && Object.keys(value).length === 0)) {
+      formObj[key] = undefined
+    }
   }
-  return result
+  return formObj
 }
 
-function onSubmit() {
+async function onSubmit() {
   if (!props.configName && props.groupFormItems) {
     // 只有单表才可以成功，多表关联或者自定义sql不行
-    const params = getRealKey(form.value)
+    const requestForm = prepareForm()
+    await appendSilenceAddFields(requestForm)
+    const realForm = handleFormKeys(requestForm)
     try {
-      addOrModifyEntity(params, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
+      addOrModifyEntity(realForm, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
         showSuccessToast('提交成功！')
       })
     }
@@ -278,7 +404,7 @@ async function validate() {
 watch(() => props.formData, (_val) => {
   form.value = _val
 })
-defineExpose({ init, form, formGroupName, validate })
+defineExpose({ init, form, formGroupName, validate, asyncSubmit })
 </script>
 
 <template>

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

@@ -166,7 +166,7 @@ function getDefaultValue() {
       if (mode === '查询')
         return props.modelValue !== undefined ? props.modelValue : querySelectDefaultValue.value
       else
-        return props.modelValue !== undefined ? props.modelValue : formSelectDefaultValue.value
+        return props.modelValue !== undefined && props.modelValue ? props.modelValue : formSelectDefaultValue.value
     case 'switch':
       return props.modelValue !== undefined ? props.modelValue : false
     case 'radio':