af-mobile-client-vue3 1.0.71 → 1.0.73

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

@@ -13,6 +13,7 @@ import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOpt
 import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
 
 const props = defineProps<{
+  fixQueryForm?: object
   orderVal?: string
   sortordVal?: string
   orderList?: any[]
@@ -42,8 +43,9 @@ const colFieldNames = {
   text: 'title',
   value: 'value',
 }
+
 // 查询条件参数     !!!!!建议最后点击确认的时候完成这个的整理
-const conditionParams = ref({})
+const conditionParams = ref({fixQueryForm: props.fixQueryForm})
 
 // 重置某个选项
 function resetOptionItem(type) {
@@ -55,7 +57,7 @@ function resetOption() {
   currentOrderVal.value = undefined
   currentSortordVal.value = undefined
   // 条件参数
-  conditionParams.value = {}
+  conditionParams.value = {fixQueryForm: props.fixQueryForm}
 }
 function checkOrderOption() {
   let isCheck = true
@@ -139,7 +141,7 @@ onMounted(() => {
                 </div>
               </VanCol>
             </VanRow>
-            <XFormItem v-model="conditionParams[item.model]" :attr="item" :show-label="false" />
+            <XFormItem v-model="conditionParams[item.model]" :form='conditionParams' :attr="item" :show-label="false" />
           </template>
         </div>
         <div class="operations-panel">

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

@@ -141,7 +141,7 @@ defineExpose({ init, form, formGroupName, validate })
     </VanCellGroup>
     <div v-if="props.submitButton" style="margin: 16px;">
       <VanButton round block type="primary" native-type="submit">
-        {{ props.groupFormItems.btnName ? props.groupFormItems.btnName : '提交' }}
+        {{ props.groupFormItems?.btnName ? props.groupFormItems.btnName : '提交' }}
       </VanButton>
       <slot />
     </div>

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

@@ -26,7 +26,9 @@ import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOpt
 import type { Numeric } from 'vant/es/utils'
 import { getDict } from '@af-mobile-client-vue3/utils/dictUtil'
 import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { debounce } from 'lodash-es'
+import { searchToListOption, searchToOption } from '@af-mobile-client-vue3/services/v3Api'
 
 const props = defineProps({
   attr: {
@@ -83,6 +85,10 @@ const props = defineProps({
 })
 
 const emits = defineEmits(['update:modelValue'])
+// 判断并初始化防抖函数
+let debouncedUserLinkFunc: Function | null = null
+let debouncedDepLinkFunc: Function | null = null
+
 const { attr, form, mode, serviceName, getDataParams, columnsField } = props
 const calendarShow = ref(false)
 const option = ref([])
@@ -94,6 +100,7 @@ const showPicker = ref(false)
 const showDatePicker = ref(false)
 const showTimePicker = ref(false)
 const showArea = ref(false)
+const currUser = computed(() => userState.f.resources.id)
 // 是否展示当前项
 const showItem = ref(true)
 
@@ -169,6 +176,11 @@ onBeforeMount(() => {
   init()
   showFormItemFunc()
   dataChangeFunc()
+  if (attr?.keyName?.toString()?.startsWith('search@根据表单项[') && attr?.keyName?.toString().endsWith(']联动人员'))
+    debouncedUserLinkFunc = debounce(() => updateResOptions('人员'), 200)
+
+  if (attr?.keyName?.toString()?.startsWith('search@根据表单项[') && attr?.keyName?.toString().endsWith(']联动部门'))
+    debouncedDepLinkFunc = debounce(() => updateResOptions('部门'), 200)
 })
 // 是否展示表单左侧label文字
 const labelData = computed(() => {
@@ -186,6 +198,7 @@ const placeholder = computed(() => {
     return attr.placeholder ? attr.placeholder : `请选择${attr.name}`
 })
 // 登录信息 (可以在配置的动态函数中使用 this.setupState 获取到当前组件内的全部函数和变量 例：this.setupState.userState)
+const userState = useUserStore().getLogin()
 
 const formatDate = date => `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
 
@@ -209,12 +222,63 @@ function init() {
           option.value = result
       }, serviceName)
     }
+    else if (attr.keyName && attr.keyName.includes('search@')) {
+      let source = attr.keyName.substring(7)
+      const userid = currUser.value
+      let roleName = 'roleName'
+      if (source.startsWith('根据角色[') && source.endsWith(']获取人员')) {
+        const startIndex = source.indexOf('[') + 1
+        const endIndex = source.indexOf(']', startIndex)
+        roleName = source.substring(startIndex, endIndex)
+        source = '根据角色获取人员'
+      }
+      const searchData = { source, userid, roleName }
+      if (source.startsWith('根据表单项[') && source.endsWith(']联动人员'))
+        updateResOptions('人员')
+      else if (source.startsWith('根据表单项[') && source.endsWith(']联动部门'))
+        updateResOptions('部门')
+      else if (attr.type === 'select' || attr.type === 'checkbox')
+        searchToListOption(searchData, res => getDataCallback(res))
+      else
+        searchToOption(searchData, res => getDataCallback(res))
+    }
     else {
       initRadioValue()
     }
   }
 }
 
+function getDataCallback(res) {
+  option.value = res
+  if (attr.type === 'radio')
+    initRadioValue()
+}
+
+async function updateResOptions(type) {
+  if (attr?.keyName?.toString()?.startsWith('search@根据表单项[') && attr?.keyName?.toString()?.endsWith(`]联动${type}`)) {
+    const searchData = { source: `获取${type}`, userid: currUser.value }
+    const startIndex = attr.keyName.indexOf('[') + 1
+    const endIndex = attr.keyName.indexOf(']', startIndex)
+    const formModel = attr.keyName.substring(startIndex, endIndex).replace('.', '_')
+    // console.log(form)
+    const formModelData = form[formModel]
+    if (formModel?.length && formModelData?.length) {
+      await searchToListOption(searchData, (res) => {
+        // console.log(res)
+        // console.log(form)
+        getDataCallback(res.filter((h) => {
+          return formModelData['0'] === h.f_organization_id || formModelData['0'] === h.f_department_id || formModelData['0'] === h.parentid
+          // if (formModel.indexOf('org') > -1) {
+          //   return formModelData?.includes(h.orgid || h.f_organization_id || h.parentid)
+          // } else {
+          //   return formModelData?.includes(h?.parentid)
+          // }
+        }))
+      })
+    }
+  }
+}
+
 function initRadioValue() {
   if ((mode === '新增' || mode === '修改') && attr.type === 'radio' && !localValue.value) {
     if (attr.keys && attr.keys.length > 0)
@@ -278,9 +342,16 @@ function updateFile(files, _index) {
   emits('update:modelValue', localValue.value)
 }
 // 监听表单发生变化后触发展示函数
-watch(form, (_oldVal, _newVal) => {
+watch(() => form, (_oldVal, _newVal) => {
   showFormItemFunc()
-})
+  // 数据源来自人员联动时更新数据
+  if (attr?.keyName?.toString()?.startsWith('search@根据表单项[') && attr?.keyName?.toString().endsWith(']联动人员'))
+    debouncedUserLinkFunc()
+
+  // 数据源来自部门联动时更新数据
+  if (attr?.keyName?.toString()?.startsWith('search@根据表单项[') && attr?.keyName?.toString().endsWith(']联动部门'))
+    debouncedDepLinkFunc()
+}, { deep: true })
 </script>
 
 <template>

package/src/router/routes.ts

@@ -12,6 +12,7 @@ import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
 import SingleLayout from '@af-mobile-client-vue3/layout/SingleLayout.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
 import XSignatureView from '@af-mobile-client-vue3/views/component/XSignatureView/index.vue'
+import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 
 const routes: Array<RouteRecordRaw> = [
   {
@@ -25,6 +26,18 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XReportFormIframeView',
         component: XReportFormIframeView,
       },
+      {
+        path: '/Components/XForm',
+        name: 'XForm',
+        component: XForm,
+        props: route => ({
+          groupFormItems: JSON.parse(decodeURIComponent(route.query.groupFormItems as string)),
+          serviceName: route.query.serviceName,
+          formData: JSON.parse(decodeURIComponent(route.query.formData as string)),
+          mode: route.query.mode,
+        }),
+        meta:{ title: '新增/修改表单' }
+      },
     ],
   },
   {
@@ -58,6 +71,18 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XReportFormView',
         component: XReportFormView,
       },
+      // {
+      //   path: '/Components/XForm',
+      //   name: 'XForm',
+      //   component: XForm,
+      //   props: route => ({
+      //     groupFormItems: JSON.parse(decodeURIComponent(route.query.groupFormItems as string)),
+      //     serviceName: route.query.serviceName,
+      //     formData: JSON.parse(decodeURIComponent(route.query.formData as string)),
+      //     mode: route.query.mode,
+      //   }),
+      //   meta:{ title: '新增/修改表单' }
+      // },
       {
         path: '/Component/XFormView/:id/:openid',
         name: 'XFormView',

package/src/services/v3Api.ts

@@ -0,0 +1,136 @@
+import { METHOD, request } from '@af-mobile-client-vue3/utils/http/index'
+import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+
+function getLeafNodes (nodes) {
+   // console.log(nodes)
+  // 确保 nodes 是数组
+  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
+  return nodeArray.reduce((leaves, node) => {
+    if (node.children && node.children.length) {
+      // 递归处理子节点并合并结果
+      leaves.push(...getLeafNodes(node.children))
+    } else {
+      // 当前节点是叶子节点时，直接加入结果
+      leaves.push(node)
+    }
+    return leaves
+  }, [])
+}
+
+function getLeafNodesByCondition (type, nodes, parent = null) {
+  // console.log('nodes------',nodes)
+  // 确保 nodes 是数组
+  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
+
+  return nodeArray.reduce((leaves, node) => {
+    const isValidNode = node.resourcetype === type && node.name !== '组织机构'
+    const updatedParent = node.name === '组织机构' ? null : node.name
+
+    if (node.children && node.children.length) {
+      // 当前节点符合条件时，加入叶子节点列表
+      if (isValidNode && node.resourcetype === 'organization') {
+        leaves.push({
+          ...node,
+          name: parent ? `${node.name}` : node.name,
+          children: [],
+        })
+      }
+      if (isValidNode && node.resourcetype === 'department') {
+        leaves.push({
+          ...node,
+          name: parent ? `${node.name}-${parent}` : node.name,
+          children: [],
+        })
+      }
+      // 递归处理子节点
+      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
+    } else if (isValidNode) {
+      // 无子节点但符合条件时，直接加入叶子节点列表
+        if (node.resourcetype === 'organization'){
+          leaves.push({
+            ...node,
+            name: parent ? `${node.name}-${parent}` : node.name,
+          })
+        }else if (node.resourcetype === 'department' && !nodeArray.includes(node.name)) {
+          // console.log('数组',nodeArray.includes(node.name))
+          leaves.push({
+            ...node,
+            name: parent ? `${node.name}-${parent}` : node.name,
+          })
+        }
+      }
+    return leaves
+  }, [])
+}
+
+function transformData (inputData) {
+  function transform (node) {
+    return {
+      label: node.name,
+      value: node.id,
+      f_organization_id: node.f_organization_id,
+      f_department_id: node.f_department_id,
+      parentid: node.parentid,
+      orgid: node.orgid,
+      children: node.children ? node.children.map(transform) : []
+    }
+  }
+
+  return inputData.map(transform)
+}
+
+function getResData (params, toCallback) {
+  const data = { userId: params.userid, roleName: params.roleName }
+  if (params.source === '获取分公司') {
+    runLogic('getOrgBySearch', data, 'af-system').then(res => toCallback(res))
+  } else if (params.source === '获取部门') {
+    runLogic('getDepBySearch', data, 'af-system').then(res => toCallback(res))
+  } else if (params.source === '获取人员') {
+    runLogic('getUserBySearch', data, 'af-system').then(res => toCallback(res))
+  } else if (params.source === '根据角色获取人员') {
+    runLogic('getUserBySearchRole', data, 'af-system').then(res => toCallback(res))
+  } else {
+    return search(params).then(res => toCallback(res))
+  }
+}
+
+export async function searchToOption (params, callback) {
+  function toCallback (res) {
+    if (res.length) {
+      if (res[0].children && res[0].children.length) {
+        if (res[0].children[0].children) {
+          callback(transformData(res[0].children[0].children))
+        } else {
+          callback(transformData(res[0].children))
+        }
+      } else {
+        callback(res[0].children)
+      }
+    } else {
+      callback(res)
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function searchToListOption (params, callback) {
+  function toCallback (res) {
+    if (params.source.includes('人员')) {
+      // console.log('ren---------',res)
+      callback(transformData(getLeafNodes(res)))
+    } else {
+      const type = params.source.includes('公司') ? 'organization' : 'department'
+      // console.log('bumenpgonngsi',res)
+      callback(transformData(getLeafNodesByCondition(type, res)))
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function search (params) {
+  return request('/rs/search', METHOD.POST, params, params.config)
+}
+
+export default { searchToOption, search }

package/src/utils/http/index.ts

@@ -3,6 +3,7 @@ import { showToast } from 'vant'
 import { ContentTypeEnum, ResultEnum } from '@af-mobile-client-vue3/enums/requestEnum'
 import { ACCESS_TOKEN } from '@af-mobile-client-vue3/stores/mutation-type'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import axios from 'axios'
 
 // 默认 axios 实例请求配置
 const configDefault = {
@@ -155,4 +156,37 @@ class Http {
   }
 }
 
+const METHOD = {
+  GET: 'get',
+  POST: 'post',
+  PUT: 'put',
+  DELETE: 'delete'
+}
+/**
+ * axios请求
+ * @param url 请求地址
+ * @param method {METHOD} http method
+ * @param params 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+async function request (url, method, params, config) {
+  switch (method) {
+    case METHOD.GET:
+      return axios.get(url, { params, ...config })
+    case METHOD.POST:
+      return axios.post(url, params, config)
+    case METHOD.PUT:
+      return axios.put(url, params, config)
+    case METHOD.DELETE:
+      return axios.delete(url, { params, ...config })
+    default:
+      return axios.get(url, { params, ...config })
+  }
+}
+
 export const http = new Http(configDefault)
+export {
+  METHOD,
+  request,
+}

package/src/views/component/XCellListView/index.vue

@@ -10,7 +10,9 @@ const emit = defineEmits(['deleteRow'])
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
-const configName = ref('crud_oper_log_manage')
+// const configName = ref('crud_oper_log_manage')
+// const serviceName = ref('af-system')
+const configName = ref('crud_sources_test')
 const serviceName = ref('af-system')
 
 // 跳转到详情页面
@@ -84,8 +86,6 @@ function deleteRow(result) {
         :config-name="configName"
         :id-key="idKey"
         @to-detail="toDetail"
-        @add-option="addOption"
-        @update-row="updateRow"
         @delete-row="deleteRow"
       />
     </template>

package/src/views/component/XFormGroupView/index.vue

@@ -3,13 +3,15 @@ import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { onBeforeMount, ref } from 'vue'
 import { showDialog } from 'vant'
+// import {runLogic} from "@af-mobile-client-vue3/services/api/common";
 
 // 纯表单
-const serviceName = ref('af-linepatrol')
+// const configName = ref("计划下发Form")
+// const serviceName = ref("af-linepatrol")
 
 // 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-// const serviceName = ref("af-gaslink")
+const configName = ref("lngChargeAuditMobileFormGroup")
+const serviceName = ref("af-gaslink")
 
 const formData = ref({})
 function submit(_result) {
@@ -26,13 +28,13 @@ function submit(_result) {
 // }
 
 // 纯表单——数据
-function initComponents() {
-  formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
-}
+// function initComponents() {
+//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
+// }
 
-onBeforeMount(() => {
-  initComponents()
-})
+// onBeforeMount(() => {
+//   initComponents()
+// })
 </script>
 
 <template>

package/src/views/component/XFormView/index.vue

@@ -13,7 +13,6 @@ import { post } from '@af-mobile-client-vue3/services/restTools'
 
 const emit = defineEmits(['onSumbit'])
 const xForm = ref(null)
-const loading = ref(true)
 const id = ref(-1)
 const openid = ref('')
 const instance = getCurrentInstance()
@@ -41,10 +40,7 @@ const _currentEvaluate = {
 }
 
 // 组件挂载前获取数据
-onBeforeMount(() => {
-  if (mode === '修改')
-    getUpdateData()
-
+onBeforeMount(async () => {
   if (instance) {
     id.value = route.params.id as unknown as number
     openid.value = route.params.openid as string
@@ -54,35 +50,20 @@ onBeforeMount(() => {
 
 // 组件初始化前的判断
 async function formInit() {
-  if (id.value > 0) {
-    // 先获取 myForm
-    queryData()
-  }
-  else {
-    // 没有id 直接提示用户不存在，返回上一级
-    await showDialog({ message: '评价信息缺少参数，找不到对应评价信息' })
-    history.back()
-  }
-}
-
-// 获取配置信息
-function queryData() {
   getConfigByName(configName, (result) => {
     groupFormItems.value = result
     title.value = result.title
-    if (xForm.value) {
-      xForm.value.init({
-        formItems: result,
-        serviceName,
-        getDataParams: {},
-        formData: updateData.value ? updateData.value : null,
-      })
-      loading.value = false
-    }
+    if (mode === '修改')
+      getUpdateData()
     xFormInit.value = true
   }, serviceName)
 }
 
+// 获取配置信息
+function queryData() {
+
+}
+
 // 提交操作
 function onSubmit(params) {
   // const data = {
@@ -112,35 +93,18 @@ function onSubmit(params) {
 }
 
 // 查询需要修改的数据
-function getUpdateData() {
+async function getUpdateData() {
   if (api.value && updateId) {
-    post(api.value, updateId).then((res) => {
-      loadUpdate.value = true
-      updateData.value = res.data[0]
-    }, (_) => {
-    }).finally(() => {
-      loadUpdate.value = false
-    })
+    const res = await post(api.value, updateId)
+    updateData.value = res.data[0]
   }
 }
 
-function _onClickLeft(): void {
-  history.back()
-}
 </script>
 
 <template>
-  <!--  <VanNavBar -->
-  <!--    title="XForm表单" -->
-  <!--    left-text="返回" -->
-  <!--    left-arrow -->
-  <!--    @click-left="onClickLeft" -->
-  <!--  /> -->
   <NormalDataLayout id="XFormView" title="XForm表单">
     <template #layout_content>
-      <!--      <VanRow v-show="loading" justify="center"> -->
-      <!--        <VanLoading type="spinner" color="#1989fa" /> -->
-      <!--      </VanRow> -->
       <VanSpace direction="vertical" fill>
         <VanNavBar :title="title ? mode.concat(title) : null" />
         <XForm
@@ -148,7 +112,7 @@ function _onClickLeft(): void {
           ref="xForm"
           :group-form-items="JSON.parse(JSON.stringify(groupFormItems))"
           :service-name="serviceName"
-          :form-data="updateData ? updateData : null"
+          :form-data="updateData"
           :mode="mode"
           style="margin-bottom: 14px;"
           @on-submit="onSubmit"