vue2-client 1.14.17 → 1.14.18

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

@@ -0,0 +1,181 @@
+<template>
+  <!--    <Source src="/code/VitalSigns.vue"></Source>-->
+  <div>
+    <a-row class="box">
+      病历号&nbsp;&nbsp;<a-input v-model="vitalSignsId" style="width: 160px"></a-input>
+      <a-button-group style="margin-left: 20px;">
+        <a-button plain type="primary" @click="showVitalSignsModal('create')" :loading="loading" :disabled="!editorReady">创建体温单</a-button>
+        <a-button plain type="primary" @click="showVitalSignsModal('update')" :loading="loading" :disabled="!editorReady">更新体温单</a-button>
+      </a-button-group>
+      <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 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-row>
+    <div v-if="!editorReady" style="margin: 10px 0; padding: 10px; background-color: #fffbe6; border: 1px solid #ffe58f;">
+      <a-icon type="loading" /> 体温单编辑器加载中...
+    </div>
+    <Editor @editor-ready="onEditorReady" style="margin: 10px 0;" ref="editorComponent"></Editor>
+
+    <!-- 使用TextBox组件替代原有弹窗 -->
+    <TextBox
+      :visible="modalVisible"
+      :modalType="modalType"
+      :initialId="vitalSignsId"
+      :editorReady="editorReady"
+      :id="vitalSignsId"
+      @submit="handleSubmit"
+      @cancel="closeModal"
+    />
+  </div>
+</template>
+
+<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 { message } from 'ant-design-vue'
+
+// 响应式状态
+const vitalSignsId = ref('')
+const loading = ref(false)
+const editorReady = ref(false)
+const editorComponent = ref(null)
+const modalVisible = ref(false)
+const modalType = ref('create')
+let editor = null
+// 定义组件事件
+const emit = defineEmits(['submit'])
+// 常量
+const modalTitles = {
+  create: '创建体温单',
+  update: '更新体温单',
+  baby: '新生儿体温单'
+}
+
+// 显示弹窗
+const showVitalSignsModal = (type) => {
+  modalType.value = type
+  modalVisible.value = true
+}
+
+// 关闭弹窗
+const closeModal = () => {
+  modalVisible.value = false
+}
+
+// 编辑器初始化
+const onEditorReady = (editorObj) => {
+  try {
+    if (!editorObj) {
+      throw new Error('传入的editor对象为null或undefined')
+    }
+
+    // 尝试获取编辑器对象
+    if (typeof editorObj.createVitalSigns === 'function') {
+      editor = editorObj
+    } else if (editorObj.getEditor && typeof editorObj.getEditor === 'function') {
+      const editorFromComponent = editorObj.getEditor()
+      editor = editorFromComponent && typeof editorFromComponent.createVitalSigns === 'function'
+        ? editorFromComponent
+        : (typeof editorObj.createVitalSigns === 'function' ? editorObj : null)
+    }
+    if (!editor) {
+      throw new Error('无法获取有效的editor对象')
+    }
+    editorReady.value = true
+  } catch (err) {
+    console.error('设置editor对象失败:', err)
+    message.error('体温单编辑器初始化失败，请刷新页面重试')
+  }
+}
+
+// 执行命令
+const execCommand = (cmd) => {
+  if (!editorReady.value || !editor) return
+  loading.value = true
+  try {
+    editor.execCommand(cmd)
+  } catch (err) {
+    console.error('执行命令出错:', err)
+    message.error(`执行${cmd}命令失败`)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 处理表单提交
+const handleSubmit = async (formData) => {
+  if (!editorReady.value || !editor) {
+    message.error('体温单编辑器未加载完成，请等待或刷新页面')
+    return
+  }
+  loading.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;
+        }`
+        result = iframe.contentWindow.eval(script)
+      } else if (window.iframeEditor) {
+        result = window.iframeEditor.createVitalSigns(formData)
+      } else {
+        throw new Error('无法访问iframe')
+      }
+    } catch (err) {
+      // 备用方案
+      if (editor && typeof editor.createVitalSigns === 'function') {
+        result = editor.createVitalSigns(formData)
+      } else {
+        throw new Error('无法调用createVitalSigns方法')
+      }
+    }
+    vitalSignsId.value = result || formData.id
+    modalVisible.value = false
+    message.success(`${modalTitles[modalType.value]}成功`)
+    emit('submit', formData)
+  } catch (err) {
+    console.error('创建体温单出错:', err)
+    message.error(`创建体温单失败: ${err.message || '未知错误'}`)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 生命周期钩子
+onMounted(() => {
+  window.addEventListener('message', (event) => {
+    if (event.data?.type === 'editorReady' && !editorReady.value && editorComponent.value?.getEditor) {
+      try {
+        const editorFromComponent = editorComponent.value.getEditor()
+        if (editorFromComponent && typeof editorFromComponent.createVitalSigns === 'function') {
+          editor = editorFromComponent
+          editorReady.value = true
+        }
+      } catch (err) {
+        console.error('从组件获取editor对象错误:', err)
+      }
+    }
+  })
+})
+</script>
+
+<style scoped>
+.box {
+  display: flex;
+  align-items: center;
+  padding: 1%;
+}
+</style>

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>

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

@@ -1,155 +1,155 @@
-<script setup>
-import { getConfigByName } from '@vue2-client/services/api/common'
-import { reactive, ref, provide } from 'vue'
-import RenderRow from './RenderRow'
-import Exp500 from '@vue2-client/pages/exception/500.vue'
-
-const layout = ref(null)
-
-// 加载状态，0：加载中，1：已加载，2：出现错误
-const loaded = ref(0)
-
-// 声明组件总数
-const componentTotal = ref(0)
-
-// 注册组件总数
-const registerComponentTotal = ref(0)
-
-// 组件注册集
-const componentRefMap = reactive({})
-
-// 通用参数
-const data = {
-  comps: componentRefMap,
-  func: {
-    getConfigByName: getConfigByName
-  }
-}
-
-/**
- * 初始化构建页面组件
- * @param params
- */
-function init (params) {
-  const {
-    configName,
-    configValue,
-    serviceName
-  } = params
-  loaded.value = 0
-  const getConfigAfter = (res) => {
-    if (res == null) {
-      loaded.value = 2
-      return
-    }
-    layout.value = res
-    // 设置组件总量
-    setComponentTotal(layout.value.children)
-    loaded.value = 1
-  }
-  if (configName) {
-    getConfigByName(configName, serviceName, getConfigAfter)
-  } else {
-    getConfigAfter(JSON.parse(configValue))
-  }
-}
-
-/**
- * 注册组件
- * @param name 组件名称
- * @param vm 组件实例
- */
-function registerComponent (name, vm) {
-  componentRefMap[name] = vm
-  registerComponentTotal.value = registerComponentTotal.value + 1
-  console.info(`总组件数量：${componentTotal.value}，已注册数量：${registerComponentTotal.value}`)
-  // 初始化页面
-  initPage()
-  if (registerComponentTotal.value >= componentTotal.value) {
-    // 注册事件
-    registerEvents(layout.value.children)
-  }
-}
-provide('registerComponent', registerComponent)
-
-/**
- * 初始化页面
- */
-function initPage () {
-  if (layout.value.onMounted) {
-    // eslint-disable-next-line no-eval
-    const onMountedFun = eval('(' + layout.value.onMounted + ')')
-    onMountedFun(data)
-  }
-}
-
-/**
- * 设置需要注册的组件总数
- * @param children 组件集合
- */
-function setComponentTotal (children) {
-  children.forEach((child) => {
-    // 如果不是row类型，追加组件数量
-    if (child.type !== 'row') {
-      componentTotal.value = componentTotal.value + 1
-    }
-    // 递归追加子组件数量
-    if (child.children) {
-      setComponentTotal(child.children)
-    }
-  })
-}
-
-/**
- * 注册组件事件
- * @param children 组件集合
- */
-function registerEvents (children) {
-  children.forEach((child) => {
-    // 如果有事件，注册它们
-    if (child.event) {
-      Object.entries(child.event).forEach(([eventName, handler]) => {
-        // eslint-disable-next-line no-eval
-        const eventHandler = eval('(' + handler + ')')
-        const componentInstance = componentRefMap[child.id]
-        if (componentInstance) {
-          // 创建一个包装函数以传递额外参数
-          const wrappedHandler = function (...args) {
-            // 这里可以传递额外的参数，例如：
-            eventHandler.call(componentInstance, ...args, data)
-          }
-          componentInstance.$on(eventName, wrappedHandler)
-        }
-      })
-    }
-
-    // 递归注册子组件的事件
-    if (child.children) {
-      registerEvents(child.children)
-    }
-  })
-}
-
-defineExpose({
-  init
-})
-
-</script>
-
-<template>
-  <div class="liuli_page">
-    <div class="liuli_page_main" v-if="loaded === 1">
-      <render-row
-        v-for="row in layout.children"
-        :key="row.id"
-        :row="row"
-      />
-    </div>
-    <div class="liuli_page_error" v-else-if="loaded === 2">
-      <exp500></exp500>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="less">
-</style>
+<script setup>
+import { getConfigByName } from '@vue2-client/services/api/common'
+import { reactive, ref, provide } from 'vue'
+import RenderRow from './RenderRow'
+import Exp500 from '@vue2-client/pages/exception/500.vue'
+
+const layout = ref(null)
+
+// 加载状态，0：加载中，1：已加载，2：出现错误
+const loaded = ref(0)
+
+// 声明组件总数
+const componentTotal = ref(0)
+
+// 注册组件总数
+const registerComponentTotal = ref(0)
+
+// 组件注册集
+const componentRefMap = reactive({})
+
+// 通用参数
+const data = {
+  comps: componentRefMap,
+  func: {
+    getConfigByName: getConfigByName
+  }
+}
+
+/**
+ * 初始化构建页面组件
+ * @param params
+ */
+function init (params) {
+  const {
+    configName,
+    configValue,
+    serviceName
+  } = params
+  loaded.value = 0
+  const getConfigAfter = (res) => {
+    if (res == null) {
+      loaded.value = 2
+      return
+    }
+    layout.value = res
+    // 设置组件总量
+    setComponentTotal(layout.value.children)
+    loaded.value = 1
+  }
+  if (configName) {
+    getConfigByName(configName, serviceName, getConfigAfter)
+  } else {
+    getConfigAfter(JSON.parse(configValue))
+  }
+}
+
+/**
+ * 注册组件
+ * @param name 组件名称
+ * @param vm 组件实例
+ */
+function registerComponent (name, vm) {
+  componentRefMap[name] = vm
+  registerComponentTotal.value = registerComponentTotal.value + 1
+  console.info(`总组件数量：${componentTotal.value}，已注册数量：${registerComponentTotal.value}`)
+  // 初始化页面
+  initPage()
+  if (registerComponentTotal.value >= componentTotal.value) {
+    // 注册事件
+    registerEvents(layout.value.children)
+  }
+}
+provide('registerComponent', registerComponent)
+
+/**
+ * 初始化页面
+ */
+function initPage () {
+  if (layout.value.onMounted) {
+    // eslint-disable-next-line no-eval
+    const onMountedFun = eval('(' + layout.value.onMounted + ')')
+    onMountedFun(data)
+  }
+}
+
+/**
+ * 设置需要注册的组件总数
+ * @param children 组件集合
+ */
+function setComponentTotal (children) {
+  children.forEach((child) => {
+    // 如果不是row类型，追加组件数量
+    if (child.type !== 'row') {
+      componentTotal.value = componentTotal.value + 1
+    }
+    // 递归追加子组件数量
+    if (child.children) {
+      setComponentTotal(child.children)
+    }
+  })
+}
+
+/**
+ * 注册组件事件
+ * @param children 组件集合
+ */
+function registerEvents (children) {
+  children.forEach((child) => {
+    // 如果有事件，注册它们
+    if (child.event) {
+      Object.entries(child.event).forEach(([eventName, handler]) => {
+        // eslint-disable-next-line no-eval
+        const eventHandler = eval('(' + handler + ')')
+        const componentInstance = componentRefMap[child.id]
+        if (componentInstance) {
+          // 创建一个包装函数以传递额外参数
+          const wrappedHandler = function (...args) {
+            // 这里可以传递额外的参数，例如：
+            eventHandler.call(componentInstance, ...args, data)
+          }
+          componentInstance.$on(eventName, wrappedHandler)
+        }
+      })
+    }
+
+    // 递归注册子组件的事件
+    if (child.children) {
+      registerEvents(child.children)
+    }
+  })
+}
+
+defineExpose({
+  init
+})
+
+</script>
+
+<template>
+  <div class="liuli_page">
+    <div class="liuli_page_main" v-if="loaded === 1">
+      <render-row
+        v-for="row in layout.children"
+        :key="row.id"
+        :row="row"
+      />
+    </div>
+    <div class="liuli_page_error" v-else-if="loaded === 2">
+      <exp500></exp500>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+</style>

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

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