vue2-client 1.14.60 → 1.14.61

package/src/base-client/components/common/richTextModal/richDemo.vue

@@ -1,48 +1,48 @@
-<template>
-  <div>
-    <h1>Canvas Editor 示例</h1>
-    <x-add-native-form ref="nativeForm" />
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '../../../../services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm
-  },
-  mounted () {
-    this.$nextTick(() => {
-      getConfigByName('表单测试Form', 'af-his', (res) => {
-        const modifyModelData = {
-          data: {
-            t_f_file_id: 1,
-            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
-          },
-          images: [],
-          files: []
-        }
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          title: '收费',
-          businessType: '新增',
-          layout: 'inline',
-          modifyModelData: modifyModelData
-        })
-      })
-    })
-  },
-  methods: {
-    submit () {
-
-    }
-  }
-}
-</script>
-
-<style>
-/* 在这里添加您的样式 */
-</style>
+<template>
+  <div>
+    <h1>Canvas Editor 示例</h1>
+    <x-add-native-form ref="nativeForm" />
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '../../../../services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm
+  },
+  mounted () {
+    this.$nextTick(() => {
+      getConfigByName('表单测试Form', 'af-his', (res) => {
+        const modifyModelData = {
+          data: {
+            t_f_file_id: 1,
+            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
+          },
+          images: [],
+          files: []
+        }
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          title: '收费',
+          businessType: '新增',
+          layout: 'inline',
+          modifyModelData: modifyModelData
+        })
+      })
+    })
+  },
+  methods: {
+    submit () {
+
+    }
+  }
+}
+</script>
+
+<style>
+/* 在这里添加您的样式 */
+</style>

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -86,8 +86,7 @@
 </template>
 
 <script>
-import html2canvas from 'html2canvas'
-import jsPDF from 'jspdf'
+
 import { runLogic } from '@vue2-client/services/api/common'
 import { initDiagnosisDropdown } from './diagnosisAutocomplete'
 
@@ -388,136 +387,31 @@ export default {
         })
       }
     },
-    // 修改 save 方法
-    async save() {
+    // 保存文档
+    save () {
       // 验证必须输入项
       if (this.editorRef.validate()) {
-        try {
-          // 1. 先生成 PDF
-          const pdfBlob = await this.generatePDF()
-          
-          // 2. 获取HTML文档和结构化数据(JSON)
-          const data = {
-            doc: this.editorRef.getHtml(),
-            dataObject: this.editorRef.getBindObject(),
-            dataMode: this.dataMode,
-            resId: this.resId,
-            modifyResModel: this.modifyResModel,
-            logicExtraParams: this.logicExtraParams,
-            // 添加 PDF 数据
-            pdfData: pdfBlob
-          }
-
-          // 3. 保存到后端
-          const res = await runLogic(this.saveDataLogicName, data, this.serviceName)
-          
+        // 获取HTML文档和结构化数据(JSON)
+        const data = {
+          doc: this.editorRef.getHtml(),
+          dataObject: this.editorRef.getBindObject(),
+          dataMode: this.dataMode,
+          resId: this.resId,
+          modifyResModel: this.modifyResModel,
+          logicExtraParams: this.logicExtraParams
+        }
+        // 保存HTML文档和结构化数据到后端服务
+        runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
           this.$message.success('保存成功')
           this.changeRes(res.currResData.id)
           this.$emit('saveafter', data.dataObject)
-        } catch (error) {
-          console.error('保存失败:', error)
-          this.$message.error('保存失败，请重试')
-        } finally {
+        }).finally(() => {
           this.resDataModalVisible = false
-        }
+        })
       } else {
         this.$message.error('请检查未填写的项目')
       }
     },
-    // 修改 generatePDF 方法，返回 PDF Blob
-    async generatePDF() {
-      // 显示加载提示
-      this.$message.loading('正在生成 PDF...', 0)
-
-      try {
-        const iframe = document.getElementById('x-editor')
-        const iframeDocument = iframe.contentDocument || iframe.contentWindow.document
-
-        // 添加自定义样式
-        const style = iframeDocument.createElement('style')
-        style.textContent = `
-          body {
-            font-family: Arial, sans-serif;
-            line-height: 1.5;
-            color: #333;
-            padding: 20px;
-          }
-          h1, h2, h3 {
-            color: #000;
-            margin-bottom: 15px;
-          }
-          table {
-            border-collapse: collapse;
-            width: 100%;
-            margin-bottom: 20px;
-          }
-          th, td {
-            border: 1px solid #ddd;
-            padding: 8px;
-            text-align: left;
-          }
-          th {
-            background-color: #f5f5f5;
-          }
-          img {
-            max-width: 100%;
-            height: auto;
-          }
-        `
-        iframeDocument.head.appendChild(style)
-
-        const canvas = await html2canvas(iframeDocument.body, {
-          scale: 2,
-          useCORS: true,
-          logging: false,
-          backgroundColor: '#ffffff',
-          windowWidth: iframeDocument.documentElement.scrollWidth,
-          windowHeight: iframeDocument.documentElement.scrollHeight
-        })
-
-        const pdf = new jsPDF({
-          orientation: 'portrait',
-          unit: 'mm',
-          format: 'a4'
-        })
-
-        const imgData = canvas.toDataURL('image/png')
-        const imgWidth = 210
-        const imgHeight = (canvas.height * imgWidth) / canvas.width
-
-        const pageHeight = 297
-        let heightLeft = imgHeight
-        let position = 0
-
-        pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-
-        while (heightLeft > 0) {
-          position = heightLeft - pageHeight
-          pdf.addPage()
-          pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-          heightLeft -= pageHeight
-        }
-
-        // 生成 PDF 的 Blob 数据
-        const pdfBlob = pdf.output('blob')
-        
-        // 预览 PDF
-        const pdfUrl = URL.createObjectURL(pdfBlob)
-        window.open(pdfUrl, '_blank')
-
-        // 关闭加载提示
-        this.$message.destroy()
-        this.$message.success('PDF 生成成功')
-
-        // 返回 PDF Blob 数据
-        return pdfBlob
-      } catch (error) {
-        console.error('PDF 生成失败:', error)
-        this.$message.destroy()
-        this.$message.error('PDF 生成失败，请重试')
-        throw error // 抛出错误，让 save 方法捕获
-      }
-    },
     // 打印文档
     print () {
       this.editorRef.execCommand('print')

package/src/base-client/components/his/XHisEditor/index.js

@@ -1,3 +1,3 @@
-import XHisEditor from './XHisEditor.vue'
-
-export default XHisEditor
+import XHisEditor from './XHisEditor.vue'
+
+export default XHisEditor

package/src/base-client/components/his/XTitle/README.md

@@ -22,7 +22,7 @@ XTitle 是一个多功能的标题组件，可以显示标题文本或按钮，
 
 ### 配置参数格式
 
-XTitle 组件通过一个字符串参数进行配置
+XTitle 组件通过一个字符串参数进行配置 
 
 各部分说明：
 
@@ -37,9 +37,6 @@ XTitle 组件通过一个字符串参数进行配置
 
 ### 1. 基本标题
 
-```vue
-<x-title query-params-name="患者信息"></x-title>
-```
 ```vue
 <x-title query-params-name="患者信息-title"></x-title>
 ```
@@ -47,7 +44,7 @@ XTitle 组件通过一个字符串参数进行配置
 ### 2. 带下划线的标题
 
 ```vue
-<x-title query-params-name="患者信息-title-line"></x-title>
+<x-title query-params-name="患者信息-title--line"></x-title>
 ```
 
 ### 3. 自定义下划线颜色和宽度
@@ -56,6 +53,12 @@ XTitle 组件通过一个字符串参数进行配置
 <x-title query-params-name="患者信息-title--line-red-800"></x-title>
 ```
 
+### 4. 带点击事件的标题
+
+```vue
+<x-title query-params-name="患者信息-title-showPatient-line" @showPatient="handleShowPatient"></x-title>
+```
+
 ### 5. 按钮模式
 
 ```vue

package/src/base-client/components/index.js

@@ -1,51 +1,51 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import PersonSetting from './common/PersonSetting'
-import XFormTable from './common/XFormTable'
-import XStepView from './common/XStepView'
-import Tree from './common/Tree'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import XFormGroup from './common/XFormGroup'
-import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
-
-export default {
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  FormGroupEdit,
-  FormGroupQuery,
-  JSONToTree,
-  PersonSetting,
-  Tree,
-  Upload,
-  XAddForm,
-  XAddNativeForm,
-  XBadge,
-  XCard,
-  XDataDrawer,
-  XDescriptionsGroup,
-  XForm,
-  XFormCol,
-  XFormGroup,
-  XFormTable,
-  XImportExcel,
-  XStepView,
-  XTable,
-  XTreeOne
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import PersonSetting from './common/PersonSetting'
+import XFormTable from './common/XFormTable'
+import XStepView from './common/XStepView'
+import Tree from './common/Tree'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import XFormGroup from './common/XFormGroup'
+import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
+
+export default {
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  FormGroupEdit,
+  FormGroupQuery,
+  JSONToTree,
+  PersonSetting,
+  Tree,
+  Upload,
+  XAddForm,
+  XAddNativeForm,
+  XBadge,
+  XCard,
+  XDataDrawer,
+  XDescriptionsGroup,
+  XForm,
+  XFormCol,
+  XFormGroup,
+  XFormTable,
+  XImportExcel,
+  XStepView,
+  XTable,
+  XTreeOne
+}

package/src/base-client/components/layout/XPageView/XErrorView.vue

@@ -1,11 +1,11 @@
-<script setup>
-
-</script>
-
-<template>
-  <div>渲染失败</div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup>
+
+</script>
+
+<template>
+  <div>渲染失败</div>
+</template>
+
+<style scoped lang="less">
+
+</style>