vue2-client 1.18.33 → 1.18.35

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

@@ -1,113 +1,113 @@
-<template>
-  <!-- 根据实际部署环境修改 editor.html 的路径 -->
-  <iframe
-    src="/his/editor/editor.html"
-    width="100%"
-    height="800"
-    frameborder="0"
-    @load="onIframeLoad"
-    ref="editorIframe">
-  </iframe>
-</template>
-
-<script setup>
-
-import { ref, onBeforeUnmount } from 'vue'
-
-const editorIframe = ref(null)
-const checkEditorTimer = ref(null)
-const checkCount = ref(0)
-const editor = ref(null)
-const iframeWindow = ref(null)
-// 对外暴露的获取editor方法
-const getEditor = () => {
-  if (editor.value) {
-    return editor.value
-  }
-  if (iframeWindow.value && iframeWindow.value.editor) {
-    editor.value = iframeWindow.value.editor
-    return editor.value
-  }
-  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
-    editor.value = editorIframe.value.contentWindow.editor
-    return editor.value
-  }
-  return null
-}
-// 创建体温单方法
-const createVitalSigns = (data) => {
-  const editorObj = getEditor()
-  if (!editorObj) {
-    throw new Error('editor对象未初始化，无法创建体温单')
-  }
-  if (typeof editorObj.createVitalSigns === 'function') {
-    return editorObj.createVitalSigns(data)
-  } else {
-    throw new Error('editor对象未包含createVitalSigns方法')
-  }
-}
-
-// 检查editor对象是否已初始化
-const startEditorCheck = (frameWindow, iframe) => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-  checkCount.value = 0
-  checkEditorTimer.value = setInterval(() => {
-    checkCount.value++
-    try {
-      const editorObj = frameWindow.editor
-      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
-        clearInterval(checkEditorTimer.value)
-        editor.value = editorObj
-        // 将editor对象暴露到全局
-        window.iframeEditor = editorObj
-        window.iframeWindow = frameWindow
-        // 触发事件
-        emit('editor-ready', editorObj)
-        emit('load', { target: iframe, editor: editorObj })
-        // 发送消息通知
-        window.parent.postMessage({ type: 'editorReady' }, '*')
-      }
-    } catch (err) {
-      console.error('检查editor对象时出错:', err)
-    }
-    if (checkCount.value >= 20) {
-      clearInterval(checkEditorTimer.value)
-      console.error('Editor 对象加载失败')
-    }
-  }, 500)
-}
-// iframe加载完成的处理
-const onIframeLoad = (e) => {
-  const iframe = e.target
-  const frameWindow = iframe.contentWindow
-  iframeWindow.value = frameWindow
-  if (!frameWindow) {
-    console.error('无法访问 iframe 内容')
-    return
-  }
-  // 关闭文书工具栏
-  iframe.contentWindow.editor.option.toolbar = false
-  startEditorCheck(frameWindow, iframe)
-}
-// 组件销毁前清理
-onBeforeUnmount(() => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-})
-// 暴露方法给父组件
-defineExpose({ getEditor, createVitalSigns })
-
-// 定义事件
-const emit = defineEmits(['editor-ready', 'load'])
-</script>
-
-<style scoped>
-iframe {
-  border: none;
-  width: 100%;
-  min-height: 800px;
-}
-</style>
+<template>
+  <!-- 根据实际部署环境修改 editor.html 的路径 -->
+  <iframe
+    src="/his/editor/editor.html"
+    width="100%"
+    height="800"
+    frameborder="0"
+    @load="onIframeLoad"
+    ref="editorIframe">
+  </iframe>
+</template>
+
+<script setup>
+
+import { ref, onBeforeUnmount } from 'vue'
+
+const editorIframe = ref(null)
+const checkEditorTimer = ref(null)
+const checkCount = ref(0)
+const editor = ref(null)
+const iframeWindow = ref(null)
+// 对外暴露的获取editor方法
+const getEditor = () => {
+  if (editor.value) {
+    return editor.value
+  }
+  if (iframeWindow.value && iframeWindow.value.editor) {
+    editor.value = iframeWindow.value.editor
+    return editor.value
+  }
+  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
+    editor.value = editorIframe.value.contentWindow.editor
+    return editor.value
+  }
+  return null
+}
+// 创建体温单方法
+const createVitalSigns = (data) => {
+  const editorObj = getEditor()
+  if (!editorObj) {
+    throw new Error('editor对象未初始化，无法创建体温单')
+  }
+  if (typeof editorObj.createVitalSigns === 'function') {
+    return editorObj.createVitalSigns(data)
+  } else {
+    throw new Error('editor对象未包含createVitalSigns方法')
+  }
+}
+
+// 检查editor对象是否已初始化
+const startEditorCheck = (frameWindow, iframe) => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+  checkCount.value = 0
+  checkEditorTimer.value = setInterval(() => {
+    checkCount.value++
+    try {
+      const editorObj = frameWindow.editor
+      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
+        clearInterval(checkEditorTimer.value)
+        editor.value = editorObj
+        // 将editor对象暴露到全局
+        window.iframeEditor = editorObj
+        window.iframeWindow = frameWindow
+        // 触发事件
+        emit('editor-ready', editorObj)
+        emit('load', { target: iframe, editor: editorObj })
+        // 发送消息通知
+        window.parent.postMessage({ type: 'editorReady' }, '*')
+      }
+    } catch (err) {
+      console.error('检查editor对象时出错:', err)
+    }
+    if (checkCount.value >= 20) {
+      clearInterval(checkEditorTimer.value)
+      console.error('Editor 对象加载失败')
+    }
+  }, 500)
+}
+// iframe加载完成的处理
+const onIframeLoad = (e) => {
+  const iframe = e.target
+  const frameWindow = iframe.contentWindow
+  iframeWindow.value = frameWindow
+  if (!frameWindow) {
+    console.error('无法访问 iframe 内容')
+    return
+  }
+  // 关闭文书工具栏
+  iframe.contentWindow.editor.option.toolbar = false
+  startEditorCheck(frameWindow, iframe)
+}
+// 组件销毁前清理
+onBeforeUnmount(() => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+})
+// 暴露方法给父组件
+defineExpose({ getEditor, createVitalSigns })
+
+// 定义事件
+const emit = defineEmits(['editor-ready', 'load'])
+</script>
+
+<style scoped>
+iframe {
+  border: none;
+  width: 100%;
+  min-height: 800px;
+}
+</style>

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: 4640
+      workflowId: 2127
     })
   },
   methods: {

package/src/pages/userInfoDetailManage/ExceptionRecordQuery/index.vue

@@ -1,45 +1,45 @@
-<script>
-export default {
-  name: 'ExceptionQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    this.$refs.xFormTable.refresh(true)
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'ExceptionRecordQueryCRUD',
-      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  }
-}
-</script>
-
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="异常查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<style scoped>
-
-</style>
+<script>
+export default {
+  name: 'ExceptionQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'ExceptionRecordQueryCRUD',
+      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  }
+}
+</script>
+
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="异常查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<style scoped>
+
+</style>

package/src/router/async/router.map.js

@@ -56,12 +56,12 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/components/xScrollBox/example.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),

package/src-base-client/components/common/HIS/HForm/HForm.vue

@@ -1,347 +0,0 @@
-<script setup lang="ts">
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { ref, computed, useAttrs } from 'vue'
-
-const xAddNativeFormRef = ref()
-
-const attrs = useAttrs()
-const wrapperClassObject = computed(() => {
-  const a = attrs
-  const classes = {}
-
-  // 1) 多个布尔型样式开关（存在且为真则生效）
-  const booleanStyleKeys = [
-    'query-conditions',
-    'padding-50',
-    'label-text-horizontal',
-    'label-text-justify',
-    'charge-form'
-  ]
-  for (const key of booleanStyleKeys) {
-    const val = a[key]
-    const truthy = val === true || val === '' || val === 'true'
-    if (truthy) classes[`h-form-${key}`] = true
-  }
-  return classes
-})
-
-defineExpose({
-  getXAddNativeFormInstance: () => xAddNativeFormRef.value,
-  init: (params) => xAddNativeFormRef.value && xAddNativeFormRef.value.init && xAddNativeFormRef.value.init(params),
-  asyncSubmit: () => xAddNativeFormRef.value && xAddNativeFormRef.value.asyncSubmit && xAddNativeFormRef.value.asyncSubmit(),
-  validateForm: () => xAddNativeFormRef.value && xAddNativeFormRef.value.validateForm && xAddNativeFormRef.value.validateForm()
-})
-
-</script>
-
-<template>
-  <div
-    class="h-form-wrapper"
-    :class="[
-      wrapperClassObject
-    ]"
-  >
-
-    <x-add-native-form
-      ref="xAddNativeFormRef"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
-        <slot :name="name" v-bind="slotData" />
-      </template>
-    </x-add-native-form>
-  </div>
-</template>
-
-<style scoped lang="less">
-.h-form-wrapper {
-  // 基础样式
-  :deep(.ant-form-item) {
-    margin-bottom: 4px;
-  }
-
-  // query-conditions 样式
-  &.h-form-query-conditions {
-    // ant-card-body 样式
-    :deep(.ant-card-body) {
-      padding: 0px;
-    }
-
-    // ant-row-flex 样式
-    :deep(.ant-row-flex) {
-      // x-form-col-wrapper 样式
-      .x-form-col-wrapper {
-        .ant-form-item {
-          display: flex;
-          width: 100%;
-          margin-bottom: 4px;
-          justify-content: space-between;
-
-          .ant-form-item-label {
-            padding-left: 4px;
-            width: 100%;
-          }
-
-          .ant-form-item-control-wrapper {
-            padding-left: -6px;
-          }
-        }
-      }
-
-      // ant-col-24 样式
-      .ant-col-24 {
-        padding: 0px 4px !important;
-      }
-    }
-  }
-
-  &.h-form-padding-50 {
-    // ant-row-flex 样式
-    :deep(.ant-row-flex) {
-      padding-left: 50px;
-      padding-right: 50px
-    }
-  }
-
-  // charge-form 样式
-  &.h-form-charge-form {
-    margin-top: 2px !important;
-    // 定义变量
-    @font-common: {
-      font-family: 'Source Han Sans', sans-serif;
-      font-size: 16px;
-      font-weight: normal;
-      letter-spacing: 0em;
-      font-variation-settings: "opsz" auto;
-      font-feature-settings: "kern" on;
-    };
-
-    @color-primary: #313131;
-    @color-placeholder: #999999;
-
-    // 定义混合宏
-    .input-base() {
-      width: 100%;
-      height: 30px;
-      line-height: 30px;
-      vertical-align: top;
-      margin: 0;
-      text-align: left;
-      color: @color-primary;
-      opacity: 1;
-      @font-common();
-    }
-
-    .placeholder-base() {
-      color: @color-placeholder;
-      opacity: 1;
-      @font-common();
-    }
-
-    .option-group-base() {
-      height: 30px;
-      line-height: 30px;
-      display: flex;
-      align-items: center;
-
-      .ant-radio-wrapper,
-      .ant-checkbox-wrapper {
-        height: 30px;
-        line-height: 30px;
-        margin-right: 16px;
-      }
-    }
-
-    :deep(.ant-form-item) {
-      margin-bottom: 16px;
-      margin-top: 0;
-      padding: 0;
-      display: flex;
-      align-items: center;
-
-      .ant-form-item-label {
-        text-align: left;
-        margin: 0 16px 0 0 !important;
-        width: 64px;
-        min-width: 64px;
-        max-width: 64px;
-        flex-shrink: 0;
-
-        label {
-          height: 23px;
-          opacity: 1;
-          line-height: 23px;
-          color: @color-primary;
-          margin: 0;
-          padding: 0;
-          white-space: nowrap;
-          display: block;
-          @font-common();
-
-          // 移除冒号
-          &::after {
-            content: '';
-          }
-        }
-      }
-
-      .ant-form-item-control-wrapper {
-        margin: 0;
-        padding: 0;
-        flex: 1;
-        min-width: 0;
-        display: flex;
-        align-items: center;
-
-        .ant-form-item-control {
-          margin: 0;
-          padding: 0;
-          width: 100%;
-          text-align: left;
-          line-height: 30px !important;
-
-          // 输入框样式统一
-          .ant-input,
-          .ant-input-affix-wrapper,
-          .ant-select,
-          .ant-input-number,
-          .ant-picker,
-          .ant-radio-group,
-          .ant-checkbox-group {
-            .input-base();
-          }
-
-          // 选择器样式
-          .ant-select {
-            .ant-select-selector {
-              .input-base();
-              height: 30px;
-              line-height: 30px;
-
-              .ant-select-selection-item {
-                .input-base();
-                line-height: 30px;
-              }
-
-              .ant-select-selection-placeholder {
-                .placeholder-base();
-                line-height: 30px;
-              }
-            }
-          }
-
-          // 日期选择器样式
-          .ant-picker {
-            height: 30px;
-
-            .ant-picker-input {
-              height: 30px;
-              line-height: 30px;
-              .input-base();
-
-              input {
-                .input-base();
-                height: 30px;
-                line-height: 30px;
-              }
-            }
-          }
-
-          // 数字输入框样式
-          .ant-input-number {
-            height: 30px;
-
-            .ant-input-number-input {
-              .input-base();
-              height: 30px;
-              line-height: 30px;
-            }
-          }
-
-          // 单选框组样式
-          .ant-radio-group {
-            .option-group-base();
-          }
-
-          // 复选框组样式
-          .ant-checkbox-group {
-            .option-group-base();
-          }
-        }
-      }
-    }
-
-    // 重置可能的容器边距
-    :deep(.ant-row) {
-      margin: 0;
-      padding: 0;
-
-      .ant-col {
-        margin: 0;
-        padding: 0;
-      }
-    }
-
-    // 强制重置所有可能的表单项样式
-    :deep(.ant-form-item) {
-      margin: 0 0 16px 0 !important;
-
-      // 重置可能的内部边距
-      .ant-form-item-control-input,
-      .ant-form-item-control-input-content {
-        margin: 0 !important;
-        padding: 0 !important;
-      }
-    }
-  }
-
-  // label-text-horizontal 样式 - 只控制label文字从左到右排列
-  &.h-form-label-text-horizontal {
-    :deep(.ant-form-item-label) {
-      text-align: left;
-      direction: ltr;
-
-      // 标签文字水平排列
-      .ant-form-item-label-text {
-        display: inline-block;
-        text-align: left;
-        direction: ltr;
-        unicode-bidi: normal;
-      }
-
-      // 必填标识水平排列
-      .ant-form-item-required::before {
-        margin-right: 4px;
-        margin-left: 0;
-      }
-    }
-  }
-
-  // label-text-justify 样式 - 标签文字两端对齐分散占满 必填*可能会有问题
-  &.h-form-label-text-justify {
-    :deep(.ant-form-item-label) {
-      padding-left: 0;
-      padding-right: 8px;
-      label {
-        position: relative;
-        display: block;
-        width: 100%;
-        white-space: nowrap;
-        margin: 0;
-        text-indent: 0;
-        text-align: justify;
-        text-align-last: justify;
-        text-justify: inter-ideograph;
-        box-sizing: border-box;
-        padding-right: 12px; // 给绝对定位的冒号留出空间
-      }
-      // 将冒号绝对定位到最右侧，避免参与两端对齐计算
-      label::after {
-        position: absolute;
-        right: 0;
-      }
-    }
-  }
-}
-</style>