vue2-client 1.21.13 → 1.21.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.21.13",
+  "version": "1.21.14",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -201,7 +201,7 @@ import { formatDate, setDataByRealKey } from '@vue2-client/utils/util'
 import * as util from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
 import { addOrModify, getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
-import {checkIdNumber, REG_EMAIL, REG_LANDLINE, REG_PHONE, REG_PHONE_MASKED} from '@vue2-client/utils/reg'
+import { checkIdNumber, isMaskedPhone, REG_EMAIL, REG_LANDLINE, REG_PHONE } from '@vue2-client/utils/reg'
 import moment from 'moment/moment'
 import { executeStrFunction, executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import formValidationMixin from '@vue2-client/mixins/formValidationMixin'
@@ -855,14 +855,19 @@ export default {
             this.rules[rulesArrayKey].push({
               type: 'userPhone',
               validator: (rule, value, callback) => {
-                if(value && REG_PHONE_MASKED.test(value)){
+                if (!value) {
                   callback()
+                  return
                 }
-                if (value && !REG_PHONE.test(value)) {
-                  callback(new Error('请输入正确的手机号码'))
-                } else {
+                if (isMaskedPhone(value)) {
                   callback()
+                  return
+                }
+                if (!REG_PHONE.test(value)) {
+                  callback(new Error('请输入正确的手机号码'))
+                  return
                 }
+                callback()
               },
               message: '请输入正确的手机号码',
               trigger: 'blur'
@@ -872,11 +877,15 @@ export default {
           case 'idNumber': {
             this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
-                if (value && !checkIdNumber(value)) {
-                  callback(new Error('请输入正确的身份证号码'))
-                } else {
+                if (!value) {
                   callback()
+                  return
+                }
+                if (!checkIdNumber(value)) {
+                  callback(new Error('请输入正确的身份证号码'))
+                  return
                 }
+                callback()
               },
               trigger: 'blur'
             })
@@ -885,11 +894,19 @@ export default {
           case 'landlineNumber': {
             this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
-                if (value && !REG_LANDLINE.test(value)) {
-                  callback(new Error('请输入正确的座机号码'))
-                } else {
+                if (!value) {
+                  callback()
+                  return
+                }
+                if (isMaskedPhone(value)) {
                   callback()
+                  return
+                }
+                if (!REG_LANDLINE.test(value)) {
+                  callback(new Error('请输入正确的座机号码'))
+                  return
                 }
+                callback()
               },
               trigger: 'blur'
             })
@@ -1064,24 +1081,33 @@ export default {
     },
 
     async asyncSubmit() {
+      const selectForm = this.$refs.selectForm
+      if (!selectForm) {
+        return Promise.reject(new Error('表单尚未加载完成'))
+      }
       return new Promise((resolve, reject) => {
-        this.$refs.selectForm.validate(async valid => {
+        selectForm.validate(async valid => {
           if (!valid) {
             reject(new Error('Form validation failed'))
             return
           }
-          this.loading = true
-          const requestForm = this.prepareForm()
-          await this.appendSilenceAddFields(requestForm)
-          const realForm = this.handleFormKeys(requestForm)
-          resolve({
-            realForm,
-            businessType: this.businessType,
-            serviceName: this.serviceName,
-            currUserName: this.currUser.name,
-            currUserId: this.currUser.id,
-            orgId: this.currUser.orgid
-          })
+          try {
+            this.loading = true
+            const requestForm = this.prepareForm()
+            await this.appendSilenceAddFields(requestForm)
+            const realForm = this.handleFormKeys(requestForm)
+            resolve({
+              realForm,
+              businessType: this.businessType,
+              serviceName: this.serviceName,
+              currUserName: this.currUser.name,
+              currUserId: this.currUser.id,
+              orgId: this.currUser.orgid
+            })
+          } catch (error) {
+            this.loading = false
+            reject(error)
+          }
         })
       })
     },

package/src/base-client/components/common/XFormGroup/XFormGroup.vue

@@ -319,10 +319,11 @@ export default {
       })
     },
     scrollToGroup(index) {
-      const groupElement = this.$refs[`group-${index}`][0]
-      if (groupElement) {
-        groupElement.scrollIntoView({ behavior: 'smooth' })
-      }
+      const groupElement = this.$refs[`group-${index}`]?.[0]
+      if (!groupElement) return
+
+      this.activeTab = index
+      groupElement.scrollIntoView({ behavior: 'smooth', block: 'start' })
     },
     /**
      * 控制表单组的显示/隐藏
@@ -413,6 +414,7 @@ export default {
     },
     async onSubmit() {
       let pass = true
+      let firstFailedIndex = -1
       const promises = this.groups.map((item, index) => {
         const nativeFormRef = this.$refs[`nativeForm-${index}`] ? this.$refs[`nativeForm-${index}`][0] : undefined
         if ((item.groupName || item.slotName) && nativeFormRef && typeof nativeFormRef.asyncSubmit === 'function') {
@@ -424,7 +426,10 @@ export default {
             })
             .catch(_err => {
               pass = false
-              this.scrollToGroup(index)
+              // 记录最靠前的失败组，避免并行校验时多次 scrollToGroup 互相覆盖
+              if (firstFailedIndex === -1 || index < firstFailedIndex) {
+                firstFailedIndex = index
+              }
             })
         } else {
           console.warn(item.groupName + '未找到组件，或者组件没有 asyncSubmit 方法')
@@ -435,10 +440,12 @@ export default {
 
       try {
         await Promise.all(promises)
-
         if (pass) {
           return Promise.resolve(this.allFormData)
         } else {
+          if (firstFailedIndex !== -1) {
+            this.scrollToGroup(firstFailedIndex)
+          }
           this.$message.error('请检查表单填写是否正确')
           return Promise.reject(new Error('Form validation failed'))
         }

package/src/base-client/components/common/XFormGroup/demo.vue

@@ -1,88 +1,500 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="档案管理"
+      :queryParamsName="queryParamsName"
+      @edit="editUser"
+      @afterQuery="afterQuery"
+      serviceName="af-revenue"
+      ref="xFormTable"
+    >
+    </x-form-table>
+    <a-modal
+      :confirm-loading="confirmLoading"
+      v-model="formModalVisible"
+      :dialog-style="{ top: '30px' }"
+      :bodyStyle="{ height: '70vh' }"
+      :destroy-on-close="true"
+      :title="formTitle"
+      :keyboard="false"
+      @ok="submitAddForm"
+      width="85vw"
+    >
+      <x-form-group ref="xFormGroupDemo" @x-form-item-emit-func="groupFromItemEmitFunc">
+        <template #devices="{ data, index }">
+          <user-devices
+            @setRef="setRef(`nativeForm-${index}`)"
+            :ref="`nativeForm-${index}`"
+            :data="data"
+          ></user-devices>
+        </template>
+        <template #security="{ data, index }">
+          <user-security
+            @setRef="setRef1(`nativeForm-${index}`)"
+            :ref="`nativeForm-${index}`"
+            :data="data"
+          ></user-security>
+        </template>
+      </x-form-group>
+    </a-modal>
+  </a-card>
+</template>
+
 <script>
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
-import {getConfigByNameAsync} from '@vue2-client/services/api/common'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm'
+import XDescriptionsGroup from '@vue2-client/base-client/components/common/XDescriptions/XDescriptionsGroup.vue'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
+import { mapState } from 'vuex'
+import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
+import userInfoDetailManage from '@vue2-client/pages/userInfoDetailManage'
 
 export default {
-  name: 'Demo',
-  components: {XFormGroup},
+  name: 'UserFilesManage',
+  components: {
+    XFormTable,
+    XFormGroup,
+    XDescriptionsGroup,
+    XAddNativeForm,
+    XAddForm,
+    userInfoDetailManage
+  },
   data() {
     return {
-      visible: true,
-      /** 与 XFormGroup 内 allFormData 同步，用于展示总表单数据 */
-      allFormDataSnapshot: {}
+      // 查询配置名称
+      queryParamsName: 'UserFilesListCRUD',
+      // 查询表单赋值
+      fixedQueryForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      userInfoDetailVisible: false,
+      // 提交加载动画
+      confirmLoading: false,
+      // 是否显示详情抽屉
+      formModalVisible: false,
+      // 是否展示选择地址组件
+      selectAddressVisible: false,
+      accountClosureShow: false,
+      batchCancelUser: false,
+      accountClosureType: '',
+      oneUserManyMetersShow: false,
+      isSyncUser: false,
+      keyboard: false,
+      // 当前记录
+      record: {},
+      // 销户启用相关
+      enableUserVisible: false,
+      enableUserRecord: null,
+      enableUserReason: '',
+      enableUserLoading: false,
+      // 表单组title
+      formTitle: '新建档案',
+      // 修改设备列表
+      editDevices: [],
+      // 记录当前页面数据
+      curPageData: undefined,
+      // 查询参数
+      conditionParams: undefined,
+      securityDevices: [],
+      // 修改备用电话列表
+      rentPhone: [],
+      // 是否修改过备用电话标识
+      isEditRentPhone: false,
+      // 选择的省市区列表
+      divisions: undefined,
+      form: {
+        f_address_type: '',
+        f_residential_area_id: '',
+        f_street: '',
+        f_residential_area: '',
+        f_iscity: ''
+      },
+      addressModel: [
+        {
+          expression: '{f_building}楼号{f_unit}单元{f_floor}楼层{f_room}门牌号',
+          label: '城市',
+          value: '城市'
+        },
+        {
+          expression: '{f_building}组{f_unit}号',
+          label: '乡镇',
+          value: '乡镇'
+        },
+        {
+          expression: '{f_address}',
+          label: '自定义',
+          value: '自定义'
+        }
+      ],
+      config: {
+        showStreet: false, // 新增地址展示街道
+        autoEdit: false, // 选择小区后自动填充表单
+        isAutoEdit: false, // 选择小区后自动填充表单
+        addAddress: false // 获取定位后重新新建地址
+      },
+      addAddressFlag: false,
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
+      formItems: [],
+      areaList: [],
+      streetList: [],
+      street: '',
+      signContractVisible: false,
+      // 当前同步的用户记录
+      currentSyncRecord: {},
+      // 选中数据
+      finalSelectedRows: [],
+      // 销户启用表单数据
+      enableUserForm: {}
     }
   },
   created() {
-    getConfigByNameAsync('changeMeterFormGroup', 'af-revenue').then(res => {
-      this.$refs.xFormGroupDemo.init({
-        ...res,
-        serviceName: 'af-revenue',
-        formShow: {showfillgasInfo: false},
-        modifyModelData: { },
-        extData: {
-         user:{}
-        }
-      })
+    getConfigByNameAsync('UserFilesManageConfig', 'af-revenue').then(res => {
+      this.config = Object.assign(this.config, res)
+      console.log(this.config)
+      if (this.config.showStreet) {
+        this.getStreetList('')
+      } else {
+        this.getAreaList('')
+      }
     })
   },
-  computed: {
-    allFormDataJson() {
-      try {
-        return JSON.stringify(this.allFormDataSnapshot, null, 2)
-      } catch (e) {
-        return String(e)
-      }
+  mounted() {
+    this.batchCancelUser = this.$login.r.includes('V4批量销户')
+  },
+  watch: {
+    'form.f_address_type'(newVal, oldVal) {
+      this.onAddressTypeChange(newVal, oldVal)
     }
   },
   methods: {
-    /**
-     * 事件参数为 (groupName, 当前组 formData)，但总数据已在子组件 allFormData 中合并完毕
-     */
-    xFormGroupDataChange() {
-      const group = this.$refs.xFormGroupDemo
-      if (!group || !group.allFormData) return
-      this.allFormDataSnapshot = JSON.parse(JSON.stringify(group.allFormData))
-    },
-    submitForm() {
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        console.log('所有表单的结果', res)
+    refresh() {
+      this.$refs.xFormTable.refreshTable(true)
+    },
+
+    cancel() {
+      this.formCancelUser = false
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    afterQuery(res, conditionParams) {
+      console.log('查询触发之后', res, conditionParams)
+      res.then(r => {
+        this.curPageData = r
+        this.conditionParams = conditionParams
       })
     },
-    async meterBaseChange(attr, value) {
-      if (!(value || value === 0)) {
-        return
+
+    handleSearch(value) {
+      this.getAreaList(value)
+    },
+
+    getStreetList(value) {
+      runLogic(
+        'getStreetListByName',
+        {
+          orgId: this.currUser.orgid,
+          name: value
+        },
+        'af-revenue'
+      ).then(res => {
+        console.log(res)
+        this.streetList = res
+      })
+    },
+    async getAreaList(name) {
+      // 新版必须带街道ID
+      const params = this.config.showStreet
+        ? { orgId: this.currUser.orgid, f_street_id: this.street, name }
+        : { orgId: this.currUser.orgid, name }
+      const res = await runLogic('getAreaListByName', params, 'af-revenue')
+      this.areaList = res
+    },
+    handleChange(value) {
+      this.form.f_residential_area = this.areaList.find(item => item.value === value).label
+      this.street = this.areaList.find(item => item.value === value).f_street
+    },
+    onAddressTypeChange(newVal, oldVal) {
+      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
+      Object.keys(this.form).forEach(key => {
+        if (key.endsWith('_suffix')) {
+          this.form[key] = ''
+        }
+      })
+      console.log('selectedModel' + selectedModel)
+      if (selectedModel) {
+        const matches = selectedModel.expression.match(/{(.*?)}([^{}]*)(?={|$)/g)
+        this.formItems = matches.map(item => {
+          const value = item.match(/{(.*?)}/)[1]
+          const label = item.replace(/{.*?}/, '').trim()
+          // 处理后缀
+          this.form[`${value}_suffix`] = label
+          return {
+            label: label || (value === 'f_address' || value === 'f_room' ? '' : value), // 如果存在后面的文字，就使用后面的文字作为 label，否则使用原来的值
+            value: `${value}`
+          }
+        })
       }
-      this.$refs.xFormGroupDemo.updateGroupValues('fillgasInfo', {
-        f_remanent_gas: value + 11,
-        f_stair_use: 12
+    },
+    columnClick(key, value, record) {
+      this.record = record
+      this.record.f_userinfo_id = record.u_f_userinfo_id
+      this.record.f_userinfo_code = record.u_f_userinfo_code
+      this.userInfoDetailVisible = true
+    },
+    setRef(refName) {
+      // 给表单组赋值ref
+      // 因为提交的时候 表单组需要循环便利 ref 的 提交事件
+      this.$refs.xFormGroupDemo.setRef(refName, [this.$refs[refName]])
+      this.$refs[refName].init(this.editDevices)
+    },
+    setRef1(refName) {
+      // 给表单组赋值ref
+      // 因为提交的时候 表单组需要循环便利 ref 的 提交事件
+      this.$refs.xFormGroupDemo.setRef(refName, [this.$refs[refName]])
+      this.$refs[refName].init(this.securityDevices)
+    },
+    editUser(record, id, type) {
+      this.confirmLoading = false
+      this.formTitle = '编辑档案'
+      this.config.autoEdit = false // 编辑档案时选择地址不自动回填
+      const _record = getRealKeyData(record)
+      getConfigByNameAsync('editUserGeneralInfoFrom', 'af-revenue').then(configRes => {
+        runLogic(
+          'getFileDetailForEdit',
+          {
+            f_userinfo_id: _record.f_userinfo_id
+          },
+          'af-revenue',
+          false,
+          {
+            globalLoading: true
+          }
+        ).then(res => {
+          this.formModalVisible = true
+          // 组织修改表单
+          this.$nextTick(() => {
+            this.$refs.xFormGroupDemo.init({
+              ...configRes,
+              serviceName: 'af-revenue',
+              showLeftTab: true,
+              businessType: '编辑',
+              modifyModelData: res
+            })
+            this.editDevices = res.devices
+            this.securityDevices = res.security
+            this.rentPhone = res.phones
+          })
+        })
+      })
+    },
+    addUser() {
+      this.formTitle = '新建档案'
+      if (this.config.isAutoEdit) {
+        this.config.autoEdit = true
+      } // 新建档案时选择地址自动回填
+      getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
+        this.formModalVisible = true
+        this.$nextTick(() => {
+          this.$refs.xFormGroupDemo.init({
+            ...res,
+            serviceName: 'af-revenue',
+            showLeftTab: true,
+            businessType: '新增'
+          })
+        })
       })
-      if(this.allFormDataSnapshot.baseInfo.f_gasmodel_id) {
-        this.$refs.xFormGroupDemo.xFormShow('x-form-show', 'fillgasInfo', 2)
-      } 
+    },
+    async submitAddForm() {
+      if (this.confirmLoading) return
+      this.confirmLoading = true
+      await this.$refs.xFormGroupDemo
+        .onSubmit()
+        .then(res => {
+          console.warn('走到这个then了')
+          let saveData = Object.assign(res, { divisions: this.divisions })
+          if (this.formTitle === '编辑档案') {
+            saveData = Object.assign(saveData, {
+              f_operator_record: this.currUser.name,
+              f_operatorid_record: this.currUser.id,
+              f_orgid_record: this.currUser.orgid,
+              f_orgname_record: this.currUser.orgs,
+              f_depid_record: this.currUser.depids,
+              f_depname_record: this.currUser.dops
+            })
+          }
+          // 备用电话赋值
+          if (this.isEditRentPhone) {
+            saveData = Object.assign(saveData, {
+              rentPhone: this.rentPhone
+            })
+          }
+          if (this.isSyncUser) {
+            saveData = Object.assign(saveData, {
+              f_send_state: '已同步'
+            })
+          }
+          runLogic('userFIleSaveLogic', saveData, 'af-revenue')
+            .then(() => {
+              this.confirmLoading = false
+              this.formModalVisible = false
+              this.isSyncUser = false
+              this.$message.success('操作成功')
+              this.$refs.xFormTable.refreshTable(true)
+            })
+            .catch(() => {
+              this.confirmLoading = false
+            })
+            .finally(() => {
+              this.confirmLoading = false
+            })
+        })
+        .catch(() => {
+          console.warn('走到这个catch了')
+          this.confirmLoading = false
+        })
+        .finally(() => {
+          console.warn('走到这个finally了')
+          this.confirmLoading = false
+        })
+      this.confirmLoading = false
+    },
+    action(record, id, actionType) {
+      runLogic(
+        'querySingleUserDetail',
+        {
+          f_userinfo_code: record.u_f_userinfo_code,
+          f_userinfo_id: record.u_f_userinfo_id
+        },
+        'af-revenue'
+      ).then(res => {
+        this.record = res
+        this.detailVisible = true
+      })
+    },
+    onClose() {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    selAddress(record) {
+      // 先填充基本地址信息
+      const basicForm = {
+        f_address: record.tua_f_address,
+        f_address_id: record.tua_id
+      }
+      this.$refs.xFormGroupDemo.getNativeFormRef('t_userinfo')[0].setForm(basicForm)
+      if (!this.config.autoEdit) {
+        this.selectAddressVisible = false
+        return
+      }
+      console.log('hy 租户，执行自动填充功能')
+      // 通过后端逻辑重新查询t_area表获取完整信息
+      runLogic(
+        'getAddressDetailById',
+        {
+          id: record.tua_f_residential_area_id
+        },
+        'af-revenue'
+      )
+        .then(res => {
+          // 后端返回的是数组，取第一个元素
+          const areaData = Array.isArray(res) ? res[0] : res
+          if (!areaData) {
+            return
+          }
+          // 给用户信息表单赋值
+          const userInfoForm = {}
+          if (areaData.f_customer_type) {
+            userInfoForm.f_customer_type = areaData.f_customer_type
+          }
+          if (areaData.f_route_name) {
+            userInfoForm.f_route_name = areaData.f_route_name
+          }
+          if (areaData.f_accounting_area) {
+            userInfoForm.f_accounting_area = areaData.f_accounting_area
+          }
+          if (Object.keys(userInfoForm).length > 0) {
+            this.$refs.xFormGroupDemo.getNativeFormRef('t_userinfo')[0].setForm(userInfoForm)
+          }
+          // 给表具信息表单赋值
+          // 1. 先获取当前所有表单数据
+          const allFormData = {
+            t_userinfo: this.$refs.xFormGroupDemo.getNativeForm('t_userinfo') || {},
+            t_userfiles: this.$refs.xFormGroupDemo.getNativeForm('t_userfiles') || {},
+            t_userfiles_Other: this.$refs.xFormGroupDemo.getNativeForm('t_userfiles_Other') || {}
+          }
+          // 2. 合并 t_area 数据
+          if (areaData.f_area_code) {
+            allFormData.t_userfiles.f_area_code = areaData.f_area_code
+          }
+          if (areaData.f_meter_brand) {
+            allFormData.t_userfiles.f_gasbrand_id = Number(areaData.f_meter_brand)
+          }
+          if (areaData.f_meter_style) {
+            allFormData.t_userfiles.f_gasmodel_id = areaData.f_meter_style
+          }
+          if (areaData.f_price_name) {
+            allFormData.t_userfiles.f_price_id = Number(areaData.f_price_name)
+          }
+          console.log('准备重新打开表单弹窗，数据:', allFormData)
+          // 3. 关闭表单弹窗
+          this.formModalVisible = false
+          // 4. 延迟后重新打开（让组件完全销毁后重新渲染）
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.formModalVisible = true
+              // 5. 重新初始化表单组
+              this.$nextTick(() => {
+                getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(configRes => {
+                  this.$refs.xFormGroupDemo.init({
+                    ...configRes,
+                    serviceName: 'af-revenue',
+                    showLeftTab: true,
+                    businessType: '新增',
+                    modifyModelData: allFormData // 带上合并后的完整数据
+                  })
+                })
+              })
+            }, 300)
+          })
+          // 给表具其他信息表单赋值
+          const userFilesOtherForm = {}
+          if (areaData.f_inputtor) {
+            userFilesOtherForm.f_inputtor = areaData.f_inputtor
+          }
+          if (areaData.f_position) {
+            userFilesOtherForm.f_position = areaData.f_position
+          }
+          if (areaData.f_meter_book_num) {
+            userFilesOtherForm.f_meter_book_num = areaData.f_meter_book_num
+          }
+          if (areaData.f_changetube_date) {
+            userFilesOtherForm.f_changetube_date = areaData.f_changetube_date
+          }
+          if (Object.keys(userFilesOtherForm).length > 0) {
+            this.$refs.xFormGroupDemo.getNativeFormRef('t_userfiles_Other')[0].setForm(userFilesOtherForm)
+          }
+        })
+        .catch(err => {
+          console.warn('查询t_area表详情失败:', err)
+        })
+
+      this.selectAddressVisible = false
     }
+  },
+  computed: {
+    inputWidth() {
+      if (this.formItems.length === 1) {
+        return '85%'
+      }
+      return this.formItems.length ? `${65 / this.formItems.length}%` : '85%'
+    },
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
   }
 }
 </script>
 
-<template>
-  <a-card>
-    <a-button @click="submitForm">提交测试</a-button>
-    <a-divider orientation="left">总表单数据</a-divider>
-    <pre class="all-form-data-preview">{{ allFormDataJson }}</pre>
-    <XFormGroup ref="xFormGroupDemo" @x-form-group-data-change="xFormGroupDataChange" @meter-base-change="meterBaseChange"></XFormGroup>
-  </a-card>
-</template>
-
-<style scoped lang="less">
-.all-form-data-preview {
-  max-height: 320px;
-  overflow: auto;
-  padding: 12px;
-  margin-bottom: 16px;
-  font-size: 12px;
-  line-height: 1.5;
-  background: #fafafa;
-  border: 1px solid #f0f0f0;
-  border-radius: 4px;
-}
-</style>
+<style scoped></style>

package/src/router/async/router.map.js

@@ -60,7 +60,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue')
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/AfMap/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XImagePreview/demo.vue'),
@@ -70,7 +70,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/XInspectionDetailDrawer/demo.vue')
-  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue')
+  component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),

package/src/utils/reg.js

@@ -0,0 +1,166 @@
+/** 手机号 */
+export const REG_PHONE =
+  /^[1](([3][0-9])|([4][01456789])|([5][012356789])|([6][2567])|([7][0-8])|([8][0-9])|([9][012356789]))[0-9]{8}$/
+
+/** 邮箱 */
+export const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+
+/** url */
+export const REG_URL =
+  /(((^https?:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[\w]*))?)$/
+
+/** 身份证号校验 */
+export function checkIdNumber (value) {
+  if (isMaskedIdNumber(value)) return true
+  const psidno = String(value)
+  // 1.校验身份证号格式和长度
+  const regPsidno = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (!regPsidno.test(psidno)) {
+    return false
+  }
+  // 2.校验前两位的省份编码是否正确
+  const province = { 11: '北京', 12: '天津', 13: '河北', 14: '山西', 15: '内蒙古', 21: '辽宁', 22: '吉林', 23: '黑龙江 ', 31: '上海', 32: '江苏', 33: '浙江', 34: '安徽', 35: '福建', 36: '江西', 37: '山东', 41: '河南', 42: '湖北 ', 43: '湖南', 44: '广东', 45: '广西', 46: '海南', 50: '重庆', 51: '四川', 52: '贵州', 53: '云南', 54: '西藏 ', 61: '陕西', 62: '甘肃', 63: '青海', 64: '宁夏', 65: '新疆', 71: '台湾', 81: '香港', 82: '澳门', 91: '国外' }
+  if (!province[Number(psidno.slice(0, 2))]) {
+    return false
+  }
+  // 3.校验出生日期
+  if (psidno.length === 15) {
+    // 15位号码 省（2位）市（2位）县（2位）年（2位）月（2位）日（2位）校验码（3位）
+    const reg = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/
+    const arrSplit = psidno.match(reg)
+    // 15位号码在年份前补 19 或 20
+    const year = Number(arrSplit[2].charAt(0)) > 0 ? '19' + arrSplit[2] : '20' + arrSplit[2]
+    const month = arrSplit[3]
+    const day = arrSplit[4]
+    if (!validateBirthday(year, month, day)) {
+      return false
+    }
+  } else if (psidno.length === 18) {
+    // 18位号码 省（2位）市（2位）县（2位）年（4位）月（2位）日（2位）校验码（4位）
+    const reg = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/
+    const arrSplit = psidno.match(reg)
+    const year = arrSplit[2]
+    const month = arrSplit[3]
+    const day = arrSplit[4]
+    if (!validateBirthday(year, month, day)) {
+      return false
+    }
+  } else {
+    return false
+  }
+  // 校验出生日期是否合理
+  function validateBirthday (year, month, day) {
+    year = Number(year) // 年
+    month = Number(month) // 月
+    day = Number(day) // 日
+    const nowTime = new Date().getTime() // 当前时间戳
+    const birthTime = new Date(`${year}-${month}-${day}`).getTime() // 获取出生日期的时间戳
+    // 不能是明天出生的吧
+    if (birthTime > nowTime) {
+      return false
+    }
+    // 一般人活不到150岁吧
+    const nowYear = new Date().getFullYear()
+    if ((nowYear - year) > 150) {
+      return false
+    }
+    // 不能是13月出生的吧
+    if (month < 1 || month > 12) {
+      return false
+    }
+    // 不能是2月30号、4月31号、5月32号出生的吧
+    const date = new Date(year, month, 0) // 获取当月的最后一天
+    if (day < 1 || day > date.getDate()) {
+      return false
+    }
+    return true
+  }
+  // 4.18位号码校验生成的校验码
+  if (psidno.length === 18) {
+    const Wi = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2] // 加权因子
+    const parity = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'] // 校验码
+    let sum = 0
+    for (let i = 0; i < 17; i++) {
+      sum += Number(psidno.charAt(i)) * Wi[i]
+    }
+    if (parity[sum % 11] !== psidno[17]) {
+      return false
+    }
+  }
+  return true
+}
+/** 座机号 */
+export const REG_LANDLINE = /\d{3}-\d{8}|\d{4}-\d{7}/
+
+/** 营业执照 */
+export const REG_BUSINESS_LICENSE = /^[0-9a-zA-Z]{15}$/
+
+/** 手机号 8~11 位脱敏：前 3 + **** + 后 4，如 138****1234 */
+const REG_PHONE_MASKED_MOBILE = /^\d{3}\*{4}\d{4}$/
+
+/** 4~7 位号码脱敏：前 2 + (1~4 个 *) + 后 1 */
+const REG_PHONE_MASKED_SHORT = /^\d{2}\*{1,4}\d{1}$/
+
+/** 超过 11 位号码脱敏：前 3 + (>=5 个 *) + 后 4 */
+const REG_PHONE_MASKED_LONG = /^\d{3}\*{5,}\d{4}$/
+
+/** 带分隔符的座机/手机号脱敏，如 010-1234****5678、0371-123****4567 */
+const REG_PHONE_MASKED_FORMATTED = /^[\d\s\-()]*\*{2,}[\d\s\-()]*$/
+
+/** 18 位身份证脱敏：前 6 + ******** + 后 4 */
+const REG_ID_NUMBER_MASKED_18 = /^\d{6}\*{8}[\dX]{4}$/i
+
+/** 15 位身份证脱敏：前 6 + ****** + 后 3 */
+const REG_ID_NUMBER_MASKED_15 = /^\d{6}\*{6}\d{3}$/
+
+/** 其它长度身份证脱敏：前 6 + (1~8 个 *) + 后 1~4 位 */
+const REG_ID_NUMBER_MASKED_DEFAULT = /^\d{6}\*{1,8}[\dX]{1,4}$/i
+
+/**
+ * 判断是否为后端脱敏后的手机号/座机号（脱敏数据跳过格式校验）
+ * 规则对齐后端 maskPhone：按纯数字长度分档保留前后位数，中间替换为 *
+ */
+export function isMaskedPhone (phone) {
+  if (phone == null || phone === '') return false
+  const value = String(phone).trim()
+  if (!value.includes('*')) return false
+
+  if (
+    REG_PHONE_MASKED_MOBILE.test(value) ||
+    REG_PHONE_MASKED_SHORT.test(value) ||
+    REG_PHONE_MASKED_LONG.test(value)
+  ) {
+    return true
+  }
+
+  if (!REG_PHONE_MASKED_FORMATTED.test(value)) return false
+
+  const digitsOnly = value.replace(/\D/g, '')
+  const digitLen = digitsOnly.length
+  const starCount = (value.match(/\*/g) || []).length
+
+  // 8~11 位：保留前 3 后 4，中间 4 个 *
+  if (digitLen === 7 && starCount >= 4) return true
+  // 4~7 位：保留前 2 后 1
+  if (digitLen === 3 && starCount >= 1 && starCount <= 4) return true
+  // 超过 11 位：保留前 3 后 4，中间 length-7 个 *
+  if (digitLen === 7 && starCount >= 5) return true
+
+  return starCount >= 2 && digitLen >= 3
+}
+
+/**
+ * 判断是否为后端脱敏后的身份证号（脱敏数据跳过格式校验）
+ * 规则对齐后端 maskIdNumber
+ */
+export function isMaskedIdNumber (value) {
+  if (value == null || value === '') return false
+  const idNumber = String(value).trim().toUpperCase()
+  if (!idNumber.includes('*')) return false
+
+  if (idNumber.length === 18 && REG_ID_NUMBER_MASKED_18.test(idNumber)) return true
+  if (idNumber.length === 15 && REG_ID_NUMBER_MASKED_15.test(idNumber)) return true
+  if (idNumber.length >= 10 && REG_ID_NUMBER_MASKED_DEFAULT.test(idNumber)) return true
+
+  return false
+}