vue2-client 1.14.18 → 1.14.19

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -17,6 +17,7 @@
   - attr: 用于传递参数绑定到 modal 弹框上
 - getOutEnv 获取获取 outEnv
 - this.getRealKeyData(obj) 获取真实的数据 传递 {a_a:"1"} 返回 {a:"1"}
+- this.currUser.operaInfo 获取当前用户信息
 
 ```js
 this.openDialog('xxx', 5, {}, {}, {})
@@ -58,6 +59,7 @@ this.openDialog('xxx', 5, {}, {}, {})
   - curdAddBefore(func) 点击新增按钮时触发 传参为 打开新增表单函数
     afterDelete( res (删除接口返回数据)) 删除后触发
     action(record (当前记录), id （当前记录主键）, actionType （操作类型）) 操作按钮触发
+  - expandedGrid:"栅格名"
 
 # x-report 插槽 使用说明
 
@@ -102,7 +104,7 @@ function() {
 ### 获取表单数据之后 提交 执行logic写法
 
 ```js
-function() {
+function () {
   // 获取主formtable组件
   const res = await this.getComponentByName('from').asyncSubmit()
   // 把组件当前选中的项及select_id传给后台业务逻辑
@@ -113,7 +115,7 @@ function() {
 ### OpenDialog 弹框确认事件
 
 ```js
-function() {
+function () {
   // 获取主formtable组件  在OpenDialog 事件中使用 getComponentByName 获取 既可以获取到打开的栅格中的组件对象，也可以获取到上级调用这个栅格的栅格的对象
   const res = this.getComponentByName('main')
 }

package/package.json

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

package/src/base-client/components/his/threeTestOrders/textBox.vue

@@ -1,14 +1,14 @@
 <script setup>
 import { ref, reactive, watch } from 'vue'
 import { message } from 'ant-design-vue'
-import { runLogic } from '@/services/api/common'
+import { runLogic } from '@vue2-client/services/api/common'
 
 // 定义组件属性
 const props = defineProps({
   visible: Boolean,
   id: {
-    type: String,
-    default: '180'
+    type: Number,
+    default: 180
   },
   modalType: {
     type: String,

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

@@ -10,14 +10,32 @@
       <a-button-group style="margin: 0 20px;">
         <a-button plain type="primary" @click="showVitalSignsModal('baby')" :loading="loading" :disabled="!editorReady">新生儿体温单</a-button>
       </a-button-group>
-      <a-button-group style="margin-left: 20px;">
+      <a-button-group style="margin: 0 20px;">
         <a-button plain type="primary" @click="execCommand('preview')" :loading="loading" :disabled="!editorReady">打印预览</a-button>
         <a-button plain type="primary" @click="execCommand('print')" :loading="loading" :disabled="!editorReady">打印</a-button>
       </a-button-group>
+      <!-- 修改清空体温单按钮样式，使其更加醒目 -->
+      <a-button type="primary"
+                danger
+                @click="clearVitalSigns"
+                :loading="loading"
+                :disabled="!editorReady"
+                style="margin-left: 10px;">
+        <a-icon type="delete" /> 清空体温单
+      </a-button>
     </a-row>
     <div v-if="!editorReady" style="margin: 10px 0; padding: 10px; background-color: #fffbe6; border: 1px solid #ffe58f;">
       <a-icon type="loading" /> 体温单编辑器加载中...
     </div>
+
+    <!-- 添加体温单生成加载遮罩 -->
+    <div v-if="generating" class="generating-mask">
+      <div class="generating-content">
+        <a-spin size="large" />
+        <div class="generating-text">体温单生成中，请稍候...</div>
+      </div>
+    </div>
+
     <Editor @editor-ready="onEditorReady" style="margin: 10px 0;" ref="editorComponent"></Editor>
 
     <!-- 使用TextBox组件替代原有弹窗 -->
@@ -26,7 +44,7 @@
       :modalType="modalType"
       :initialId="vitalSignsId"
       :editorReady="editorReady"
-      :id="vitalSignsId"
+      :id="Number(vitalSignsId) || 180"
       @submit="handleSubmit"
       @cancel="closeModal"
     />
@@ -35,8 +53,8 @@
 
 <script setup>
 import { ref, onMounted } from 'vue'
-import Editor from '@/base-client/components/his/threeTestOrders/editor.vue'
-import TextBox from '@/base-client/components/his/threeTestOrders/textBox.vue'
+import Editor from './editor.vue'
+import TextBox from './textBox.vue'
 import { message } from 'ant-design-vue'
 
 // 响应式状态
@@ -46,6 +64,7 @@ const editorReady = ref(false)
 const editorComponent = ref(null)
 const modalVisible = ref(false)
 const modalType = ref('create')
+const generating = ref(false) // 添加体温单生成中状态
 let editor = null
 // 定义组件事件
 const emit = defineEmits(['submit'])
@@ -107,27 +126,170 @@ const execCommand = (cmd) => {
   }
 }
 
-// 处理表单提交
+// 清空体温单
+const clearVitalSigns = async () => {
+  if (!editorReady.value || !editor) {
+    message.error('体温单编辑器未加载完成，请等待或刷新页面重试')
+    return
+  }
+
+  loading.value = true
+  generating.value = true
+
+  try {
+    // 重新加载editor.html页面来完全重置编辑器
+    try {
+      const iframe = editorComponent.value.$refs.editorIframe
+      if (iframe) {
+        // 保存当前src
+        const currentSrc = iframe.src
+        // 确认提示
+        message.loading('正在清空体温单...', 1)
+        // 重新加载iframe
+        iframe.onload = async () => {
+          try {
+            // 等待iframe重新加载完成
+            await new Promise(resolve => setTimeout(resolve, 500))
+
+            // 获取新的editor对象
+            const newEditorObj = iframe.contentWindow.editor
+            if (newEditorObj) {
+              // 等待editor初始化
+              if (typeof newEditorObj.init === 'function') {
+                await new Promise((resolve) => {
+                  const checkInterval = setInterval(() => {
+                    if (newEditorObj.isReady) {
+                      clearInterval(checkInterval)
+                      resolve()
+                    }
+                  }, 100)
+
+                  // 最多等待5秒
+                  setTimeout(() => {
+                    clearInterval(checkInterval)
+                    resolve()
+                  }, 5000)
+                })
+              }
+
+              // 更新全局editor引用
+              editor = newEditorObj
+              window.iframeEditor = newEditorObj
+            } else {
+              throw new Error('重新加载后无法获取editor对象')
+            }
+          } catch (err) {
+            console.error('重新加载iframe后清空体温单出错:', err)
+            message.error(`清空体温单失败: ${err.message || '未知错误'}`)
+          } finally {
+            loading.value = false
+            generating.value = false
+            // 移除临时onload处理器
+            iframe.onload = null
+          }
+        }
+
+        // 重新加载iframe
+        iframe.src = currentSrc + '?t=' + new Date().getTime()
+        return
+      }
+    } catch (reloadErr) {
+      console.warn('重新加载iframe失败，将尝试其他方法清空体温单:', reloadErr)
+    }
+
+    // 备用清空方法
+    try {
+      const iframe = editorComponent.value.$refs.editorIframe
+      if (iframe?.contentWindow) {
+        iframe.contentWindow.eval(`
+          try {
+            // 尝试使用编辑器提供的各种可能的清空方法
+            if (editor) {
+              if (typeof editor.loadUrl === 'function') {
+                editor.loadUrl('');
+              } else if (typeof editor.resetDocument === 'function') {
+                editor.resetDocument();
+              } else if (typeof editor.clearContent === 'function') {
+                editor.clearContent();
+              } else if (typeof editor.clear === 'function') {
+                editor.clear();
+              } else if (typeof editor.setEditorContent === 'function') {
+                editor.setEditorContent('');
+              } else if (editor.document) {
+                try {
+                  editor.document.body.innerHTML = '';
+                } catch(clearErr) {
+                  console.warn('清空编辑器内容失败');
+                }
+              }
+            }
+          } catch(e) {
+            console.error('清空体温单失败:', e);
+          }
+        `)
+      } else if (window.iframeEditor) {
+        const editorObj = window.iframeEditor
+        if (typeof editorObj.loadUrl === 'function') {
+          editorObj.loadUrl('')
+        } else if (typeof editorObj.resetDocument === 'function') {
+          editorObj.resetDocument()
+        } else if (typeof editorObj.clearContent === 'function') {
+          editorObj.clearContent()
+        } else if (typeof editorObj.clear === 'function') {
+          editorObj.clear()
+        } else if (typeof editorObj.setEditorContent === 'function') {
+          editorObj.setEditorContent('')
+        }
+      } else if (editor) {
+        if (typeof editor.loadUrl === 'function') {
+          editor.loadUrl('')
+        } else if (typeof editor.resetDocument === 'function') {
+          editor.resetDocument()
+        } else if (typeof editor.clearContent === 'function') {
+          editor.clearContent()
+        } else if (typeof editor.clear === 'function') {
+          editor.clear()
+        } else if (typeof editor.setEditorContent === 'function') {
+          editor.setEditorContent('')
+        }
+      } else {
+        throw new Error('无法获取编辑器对象')
+      }
+    } catch (err) {
+      console.error('清空体温单出错:', err)
+      message.error(`清空体温单失败: ${err.message || '未知错误'}`)
+    }
+  } finally {
+    loading.value = false
+    generating.value = false
+  }
+}
+
+// 处理表单提交（修改为直接叠加创建，无需清空）
 const handleSubmit = async (formData) => {
   if (!editorReady.value || !editor) {
-    message.error('体温单编辑器未加载完成，请等待或刷新页面')
+    message.error('体温单编辑器未加载完成，请等待或刷新页面重试')
     return
   }
   loading.value = true
+  generating.value = true // 开始生成，显示加载遮罩
+
   try {
-    // 尝试调用iframe方法创建体温单
+    // 简化代码，直接在现有体温单上创建新的体温单（不再清空）
     let result
     try {
       const iframe = editorComponent.value.$refs.editorIframe
       if (iframe?.contentWindow) {
         const dataStr = JSON.stringify(formData)
-        const script = `try {
-          const data = JSON.parse('${dataStr.replace(/'/g, "\\'")}');
-          editor.createVitalSigns(data);
-        } catch(e) {
-          console.error('iframe执行错误:', e);
-          null;
-        }`
+        const script = `
+          try {
+            const data = JSON.parse('${dataStr.replace(/'/g, "\\'")}');
+            return editor.createVitalSigns(data);
+          } catch(e) {
+            console.error('iframe执行错误:', e);
+            return null;
+          }
+        `
         result = iframe.contentWindow.eval(script)
       } else if (window.iframeEditor) {
         result = window.iframeEditor.createVitalSigns(formData)
@@ -142,6 +304,7 @@ const handleSubmit = async (formData) => {
         throw new Error('无法调用createVitalSigns方法')
       }
     }
+
     vitalSignsId.value = result || formData.id
     modalVisible.value = false
     message.success(`${modalTitles[modalType.value]}成功`)
@@ -151,6 +314,7 @@ const handleSubmit = async (formData) => {
     message.error(`创建体温单失败: ${err.message || '未知错误'}`)
   } finally {
     loading.value = false
+    generating.value = false // 无论成功失败，都结束加载遮罩
   }
 }
 
@@ -178,4 +342,32 @@ onMounted(() => {
   align-items: center;
   padding: 1%;
 }
+
+/* 体温单生成加载遮罩样式 */
+.generating-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+.generating-content {
+  background-color: white;
+  padding: 20px 40px;
+  border-radius: 4px;
+  text-align: center;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+}
+
+.generating-text {
+  margin-top: 16px;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 16px;
+}
 </style>