af-mobile-client-vue3 1.0.70 → 1.0.72

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

@@ -14,6 +14,7 @@ import { defineEmits, nextTick, reactive, ref, watch } from 'vue'
 import { getConfigByNameWithoutIndexedDB } from '@af-mobile-client-vue3/services/api/common'
 import Uploader from '@af-mobile-client-vue3/components/core/Uploader/index.vue'
 import XReportFormJsonRender from '@af-mobile-client-vue3/components/data/XReportForm/XReportFormJsonRender.vue'
+import XSignature from '@af-mobile-client-vue3/components/data/XSignature/index.vue'
 
 // -------------------------  类型定义  -------------------------
 interface configDefine {
@@ -416,6 +417,11 @@ function formatConfigToForm(config: configDefine): void {
           tempObj.text = row[j].text
           tempObj.type = 'curDateInput'
           break
+        case 'signature' :
+          tempObj.dataIndex = row[j].dataIndex
+          tempObj.text = row[j].text
+          tempObj.type = 'signature'
+          break
         case 'inputs' :
           if (!tempObj.format)
             tempObj.format = ''
@@ -824,6 +830,19 @@ function getNow() {
                     </template>
                   </van-field>
                 </van-cell-group>
+                <!--     signature      -->
+                <van-cell-group v-else-if="row.type === 'signature'" inset style="margin-top: 4vh">
+                  <van-field
+                    :label="row.valueText ? `${row.valueText}:` : ''"
+                    readonly
+                    rows="1"
+                    autosize
+                  >
+                    <template #button>
+                      <XSignature v-model="activatedConfig.data[row.dataIndex]" />
+                    </template>
+                  </van-field>
+                </van-cell-group>
                 <!--     inputs      -->
                 <van-cell-group v-else-if="row.type === 'inputs'" inset :title="row.label">
                   <template v-if="row.inputReadOnly === true">

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

@@ -0,0 +1,285 @@
+<script setup lang="ts">
+import { computed, nextTick, onBeforeUnmount, onMounted, ref } from 'vue'
+import {
+  Button as VanButton,
+  Icon as VanIcon,
+  Popup as VanPopup,
+  Signature as VanSignature,
+  showToast,
+} from 'vant'
+
+interface Props {
+  /** 签名图片的 base64 字符串 */
+  modelValue?: string
+  /** 签名笔画的宽度，默认为 3 */
+  lineWidth?: number
+  /** 签名笔画的颜色，默认为黑色 '#000' */
+  strokeStyle?: string
+  /** 签名画布的背景颜色，默认为白色 '#fff' */
+  backgroundColor?: string
+  /** 未签名时按钮显示的文字，默认为 '签名' */
+  buttonText?: string
+  /** 自定义 CSS 类名 */
+  customClass?: string
+  /** 是否隐藏底部按钮组，默认为 false */
+  hideButtons?: boolean
+  /** 按钮尺寸，可选值为 'small' | 'normal' | 'large'，默认为 'normal' */
+  buttonSize?: 'small' | 'normal' | 'large'
+  /** 确认按钮文字，默认为 '确认' */
+  confirmButtonText?: string
+  /** 清除按钮文字，默认为 '清除' */
+  clearButtonText?: string
+  /** 是否显示签名预览图，默认为 true */
+  showPreview?: boolean
+  /** 签名完成后是否显示重新签名按钮，默认为 false */
+  showButtonAfterSigned?: boolean
+}
+
+withDefaults(defineProps<Props>(), {
+  modelValue: '',
+  lineWidth: 3,
+  strokeStyle: '#000',
+  backgroundColor: '#fff',
+  buttonText: '签名',
+  customClass: '',
+  hideButtons: false,
+  buttonSize: 'normal',
+  confirmButtonText: '确认',
+  clearButtonText: '清除',
+  showPreview: true,
+  showButtonAfterSigned: false,
+})
+
+const emit = defineEmits<{
+  'update:modelValue': [value: string]
+  'save': [image: string]
+  'clear': []
+}>()
+
+interface SignatureResult {
+  image: string
+}
+
+const showSignature = ref(false)
+
+function onSubmit({ image }: SignatureResult) {
+  if (!image) {
+    showToast('获取签名失败')
+    return
+  }
+  emit('update:modelValue', image)
+  emit('save', image)
+  showSignature.value = false
+}
+
+function onClear() {
+  emit('update:modelValue', '')
+  emit('clear')
+  showSignature.value = false
+}
+
+const signatureRef = ref()
+
+function handleSubmit() {
+  try {
+    signatureRef.value?.submit()
+  }
+  catch (error) {
+    showToast('签名提交失败')
+    console.error('Signature submit error:', error)
+  }
+}
+
+const popupStyle = computed(() => ({
+  width: '100%',
+  height: window.innerHeight > window.innerWidth ? 'auto' : '100%',
+}))
+
+function handleOrientationChange() {
+  if (showSignature.value) {
+    nextTick(() => {
+      signatureRef.value?.resize()
+    })
+  }
+}
+
+onMounted(() => {
+  window.addEventListener('orientationchange', handleOrientationChange)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('orientationchange', handleOrientationChange)
+})
+</script>
+
+<template>
+  <div class="x-signature" role="application" aria-label="签名面板">
+    <div class="signature-content">
+      <div v-if="modelValue && showPreview" class="signature-preview" @click="showSignature = true">
+        <img :src="modelValue" alt="签名预览">
+      </div>
+      <VanButton
+        v-if="!modelValue || showButtonAfterSigned"
+        type="primary"
+        size="small"
+        aria-label="打开签名面板"
+        @click="showSignature = true"
+      >
+        {{ modelValue ? '重新签名' : buttonText }}
+      </VanButton>
+    </div>
+
+    <VanPopup v-model:show="showSignature" class="signature-popup" :style="popupStyle">
+      <div class="signature-wrapper">
+        <VanSignature
+          ref="signatureRef"
+          :line-width="lineWidth"
+          :stroke-style="strokeStyle"
+          :background-color="backgroundColor"
+          @submit="onSubmit"
+          @clear="onClear"
+        />
+        <!-- 自定义浮动按钮，仅在横屏时显示 -->
+        <div class="custom-buttons">
+          <VanButton round size="small" aria-label="清除签名" @click="onClear">
+            <VanIcon name="delete" />
+          </VanButton>
+          <VanButton round type="primary" size="small" @click="handleSubmit">
+            <VanIcon name="success" />
+          </VanButton>
+        </div>
+      </div>
+    </VanPopup>
+  </div>
+</template>
+
+<style scoped lang="less">
+.x-signature {
+  width: 100%;
+
+  .signature-content {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+
+  .signature-preview {
+    flex: 1;
+    border: 1px solid #eee;
+    border-radius: 4px;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+
+    img {
+      max-width: 100%;
+      max-height: 36px;
+      height: auto;
+      display: block;
+    }
+  }
+
+  .van-button {
+    flex-shrink: 0;
+  }
+
+  :deep(.van-popup) {
+    max-width: none !important;
+    width: 100% !important;
+    top: 20% !important;
+    transform: none !important;
+    transition: all 0.3s ease-in-out;
+  }
+
+  .signature-wrapper {
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    :deep(.van-signature) {
+      width: 100% !important;
+      height: 100% !important;
+      max-width: none !important;
+    }
+
+    // 默认隐藏自定义按钮
+    .custom-buttons {
+      display: none;
+    }
+  }
+
+  // 横屏模式样式
+  @media screen and (orientation: landscape) {
+    :deep(.van-popup) {
+      top: 0 !important;
+      right: 0 !important;
+      bottom: 0 !important;
+      left: 0 !important;
+      width: 100% !important;
+      height: 100% !important;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .signature-wrapper {
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: env(safe-area-inset-top) env(safe-area-inset-right)
+              env(safe-area-inset-bottom) env(safe-area-inset-left);
+
+      :deep(.van-signature) {
+        // 隐藏原有的底部按钮
+        .van-signature__footer {
+          display: none;
+        }
+      }
+
+      :deep(.van-signature__content) {
+        height: 95% !important;
+      }
+
+      // 显示自定义浮动按钮
+      .custom-buttons {
+        position: absolute;
+        right: 32px;
+        bottom: 32px;
+        display: flex;
+        gap: 16px;
+
+        .van-button {
+          width: 48px !important;
+          height: 48px !important;
+          border-radius: 50% !important;
+          padding: 0 !important;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+          transition: transform 0.2s ease;
+
+          &--default {
+            background: #fff;
+          }
+
+          &:active {
+            transform: scale(0.95);
+          }
+        }
+      }
+    }
+  }
+
+  // 优化按钮触摸反馈
+  .custom-buttons {
+    .van-button {
+      transition: transform 0.2s ease;
+
+      &:active {
+        transform: scale(0.95);
+      }
+    }
+  }
+}
+</style>

package/src/router/routes.ts

@@ -10,6 +10,9 @@ import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
 import login from '@af-mobile-client-vue3/views/user/login/index.vue'
 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> = [
   {
@@ -23,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: '新增/修改表单' }
+      },
     ],
   },
   {
@@ -46,11 +61,28 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XCellDetailView',
         component: XCellDetailView,
       },
+      {
+        path: '/Component/XFormGroupView',
+        name: 'XFormGroupView',
+        component: XFormGroupView,
+      },
       {
         path: '/Component/XReportFormView',
         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',
@@ -61,6 +93,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'EvaluateRecordView',
         component: EvaluateRecordView,
       },
+      {
+        path: '/Component/XSignatureView',
+        name: 'XSignatureView',
+        component: XSignatureView,
+      },
     ],
   },
   {

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/authority-utils.ts

@@ -48,7 +48,6 @@ function hasAnyItem(required, source, filter): boolean {
  * @param route 路由
  * @param permissions 用户权限集合
  * @param roles 用户角色集合
- * @returns {boolean}
  */
 function hasAuthority(route, permissions, roles) {
   // TODO 此处判断可能有问题

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/utils/runEvalFunction.ts

@@ -0,0 +1,13 @@
+export function executeStrFunction(funcString, args) {
+  // 使用 eval 执行传入的函数字符串
+  // eslint-disable-next-line no-eval
+  return eval(`(${funcString})`)(...args)
+}
+
+export function executeStrFunctionByContext(context, fnStr, args) {
+  // 使用 new Function 创建函数，并绑定 context 作为 this
+  // eslint-disable-next-line no-new-func
+  const fn = new Function(`return (${fnStr});`)()
+  // 使用 bind 绑定 context，并立即调用
+  return fn.bind(context)(...args)
+}