af-mobile-client-vue3 1.2.13 → 1.2.15

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,25 +260,133 @@ 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(() => {
-        showSuccessToast('提交成功！')
+      addOrModifyEntity(realForm, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
+        showSuccessToast('提交成功!！')
       })
     }
     catch (error) {
-      showFailToast('提交失败！')
+      showFailToast('提交失败!！')
     }
     finally {
       setTimeout(() => {
@@ -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/XReportGrid/XReportDemo.vue

@@ -1,33 +1,33 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import XReport from './XReport.vue'
-
-const mainRef = ref()
-
-onMounted(() => {
-  // 初始化逻辑
-})
-</script>
-
-<template>
-  <div id="test">
-    <van-card :bordered="false">
-      <XReport
-        ref="mainRef"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"
-      />
-    </van-card>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import XReport from './XReport.vue'
+
+const mainRef = ref()
+
+onMounted(() => {
+  // 初始化逻辑
+})
+</script>
+
+<template>
+  <div id="test">
+    <van-card :bordered="false">
+      <XReport
+        ref="mainRef"
+        :use-oss-for-img="false"
+        config-name="nurseWorkstationCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"
+      />
+    </van-card>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/src/components/data/XReportGrid/print.js

@@ -1,184 +1,184 @@
-// print.js
-
-export function printElement(elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement(elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/services/api/Login.ts

@@ -1,6 +1,6 @@
-const loginApi = {
-  Login: '/af-auth/login',
-  Logout: '/af-auth/logout',
-}
-
-export { loginApi }
+const loginApi = {
+  Login: '/af-auth/login',
+  Logout: '/af-auth/logout',
+}
+
+export { loginApi }