vue2-client 1.15.66 → 1.15.68

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

@@ -14,9 +14,9 @@
               >
                 <a-select-option v-for="item of resListCp" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
               </a-select>
-              <template v-if="this.modeType !== 'readonly' && this.resId !== -1">
-                <a-button icon="plus" @click="addRes"/>
-              </template>
+<!--              <template v-if="this.modeType !== 'readonly' && this.resId !== -1">-->
+<!--                <a-button icon="plus" @click="addRes"/>-->
+<!--              </template>-->
             </template>
             <a-radio-group
               v-show="showModeChoose"
@@ -32,12 +32,62 @@
         <a-col class="editor-action">
           <a-space>
             <template v-if="this.modeType !== 'readonly'">
+<!--              <a-button-->
+<!--                type="primary"-->
+<!--                v-if = "userTemplateVisible"-->
+<!--                @click="useTemplateData"-->
+<!--              >-->
+<!--                使用-->
+<!--              </a-button>-->
+
               <a-button type="primary" @click="openRenameModal" v-if="this.resId !== -1">
                 重命名
               </a-button>
-              <a-button type="primary" @click="() => this.resId !== -1 ? save() : openAddResModal()">
-                保存
-              </a-button>
+              <!-- 组合按钮容器 -->
+              <div class="combined-save-btn">
+                <!-- 保存按钮 (左侧) -->
+                <a-button
+                  type="primary"
+                  class="save-btn-main"
+                  @click="showSaveModal('normal')"
+                >
+                  保存
+                </a-button>
+
+                <!-- 下拉部分 (右侧) -->
+                <!-- 下拉触发部分 -->
+                <template v-if="modeType !== 'design'">
+                  <a-dropdown
+                    :trigger="['click']"
+                    placement="bottomRight">
+                    <a-button
+                      type="primary"
+                      class="save-btn-dropdown">
+                      <a-icon type="down" />
+                    </a-button>
+                    <a-menu slot="overlay">
+                      <a-menu-item @click="showSaveModal('template')">
+                        保存并作为模板
+                      </a-menu-item>
+                    </a-menu>
+                  </a-dropdown>
+                </template>
+              </div>
+              <a-modal
+                title="保存"
+                :visible="saveVisible"
+                :confirm-loading="confirmLoading"
+                @ok="handleSaveConfirm"
+                @cancel="saveVisible = false"
+              >
+                <a-form-item label="文件名" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
+                  <a-input
+                    v-model="fileName"
+                    placeholder="请输入文件名"
+                    @pressEnter="handleSaveConfirm"
+                  />
+                </a-form-item>
+              </a-modal>
             </template>
             <a-button type="primary" @click="print">
               打印
@@ -110,6 +160,9 @@ export default {
       loading: false,
       resDataModalMode: 'modify',
       resDataModalVisible: false,
+      saveVisible: false,
+      // 使用按钮显隐控制
+      // userTemplateVisible: false,
       objectOfAttrs: {
         width: '100%',
         height: '650vh',
@@ -119,6 +172,15 @@ export default {
       modeType: 'form',
       // 是否显示模式切换功能
       showModeChoose: true,
+      // 是否作为模板 1 是，0 否
+      isTemplate: 0,
+      // 模板id
+      templateId: undefined,
+      admissionId: undefined,
+      // 保存类型
+      saveType: 'normal',
+      confirmLoading: false,
+      fileName: '',
       // 数据模式列表
       modeList: [
         {
@@ -144,6 +206,8 @@ export default {
       fileUrl: undefined,
       // 文档绑定数据
       bindObject: undefined,
+      // 合并模板数据后文档数据
+      assignBindObject: undefined,
       // 数据模式 template:模板编辑；data:数据编辑
       dataMode: undefined,
       // 保存数据调用的Logic名称
@@ -235,6 +299,27 @@ export default {
         }
       }
     },
+    showSaveModal (type) {
+      this.saveType = type  // 记录当前保存类型
+      this.saveVisible = true;
+    },
+    handleSaveConfirm () {
+      if (!this.fileName.trim()) {
+        this.$message.error('文件名不能为空');
+        return;
+      }
+      this.confirmLoading = true;
+      // 根据保存类型执行不同的操作
+      if (this.saveType === 'normal') {
+        if (this.resId !== -1 || this.resId !== undefined) {
+          this.save();
+        } else {
+          this.openAddResModal();
+        }
+      } else if (this.saveType === 'template') {
+        this.saveAsTemplate();
+      }
+    },
     /* eslint-disable */
     // 初始化文档
     onload (e) {
@@ -264,6 +349,12 @@ export default {
       } else {
         this.dataMode = 'template'
       }
+      if (logicExtraParams?.admissionId !== undefined && logicExtraParams?.templateId !== undefined) {
+        this.admissionId = logicExtraParams.admissionId
+        this.templateId = logicExtraParams.templateId
+      } else {
+        console.warn('病例id:admissionId不存在或模板id:templateId不存在')
+      }
       this.saveDataLogicName = saveDataLogicName
       this.logicExtraParams = logicExtraParams
       this.serviceName = serviceName
@@ -275,7 +366,6 @@ export default {
       this.loadFile(fileUrl, bindObject, currResData).then(async () => {
         // 文件加载完成后再初始化自动完成
         await this.initDiagnosisAutocomplete(dropDownBoxParams)
-        console.log("bindObject",bindObject)
       })
       this.loadResList()
     },
@@ -310,9 +400,14 @@ export default {
         })
       })
     },
+    // 保存并作为模板
+    saveAsTemplate () {
+      this.isTemplate = 1
+      this.save()
+    },
     // 加载文档列表
     loadResList () {
-      runLogic('getMedicalList', this.logicExtraParams, this.serviceName).then(res => {
+      runLogic('getTemplateListLogic', this.logicExtraParams, this.serviceName).then(res => {
         this.resList = res
         this.toggleResId = this.resId
       })
@@ -364,40 +459,75 @@ export default {
     reload (params) {
       runLogic('getFileInformation', params, this.serviceName).then(res => {
         this.resDataModalVisible = false
-        this.init({
-          modeType: this.modeType,
-          fileUrl: res.url,
-          resId: res.id,
-          currResData: res.currResData,
-          bindObject: res.bindObject,
-          saveDataLogicName: this.saveDataLogicName,
-          serviceName: this.serviceName,
-          logicExtraParams: this.logicExtraParams,
-          dropDownBoxParams: this.dropDownBoxParams
-        })
-        console.log('bindObject33',res.bindObject)
+        this.assignBindObject = this.assignTemplates(this.bindObject, res.bindObject)
+        this.useTemplateData()
+        // this.init({
+        //   modeType: this.modeType,
+        //   fileUrl: res.url,
+        //   resId: res.id,
+        //   currResData: res.currResData,
+        //   bindObject: res.bindObject,
+        //   saveDataLogicName: this.saveDataLogicName,
+        //   serviceName: this.serviceName,
+        //   logicExtraParams: this.logicExtraParams,
+        //   dropDownBoxParams: this.dropDownBoxParams
+        // })
+      })
+    },
+    // 合并模板数据
+    assignTemplates (newBindObject, templateData) {
+      // 检查templates数组是否存在
+      if (!templateData.templates || !Array.isArray(templateData.templates)) {
+        console.warn('templateData.templates不存在或不是数组')
+        return
+      }
+      // 遍历templates数组中的每个属性名
+      templateData.templates.forEach(propName => {
+        // 检查templateData是否有该属性
+        if (propName in templateData) {
+          // 无论newBindObject是否有该属性，都进行赋值/添加
+          newBindObject[propName] = templateData[propName]
+        } else {
+          console.warn(`templateData中不存在属性: ${propName}`)
+        }
       })
+      return newBindObject
+    },
+    useTemplateData () {
+      // 确认是否有合并后的模板数据
+      if (!this.assignBindObject) {
+        this.$message.warning('没有可用的模板数据');
+        return;
+      }
+      this.editorRef.setBindObject(this.assignBindObject)
+      console.log('resId', this.resId)
     },
     // 切换文档
     changeRes (value) {
-      if (this.resId === -1) {
+      console.log('value', value)
+      let params = {
+        resId: value
+      }
+      if (value === -1) {
+        params = {
+          ...params,
+          admissionId: this.admissionId,
+          f_template_id: this.templateId
+        }
         const that = this
         this.$confirm({
           title: '确认切换文档吗？',
           content: '您有尚未保存的文档，切换文档将丢失所有的修改',
           onOk () {
-            that.reload({
-              resId: value
-            })
+            that.reload(params)
+            // that.userTemplateVisible = true
           },
           onCancel () {
             that.toggleResId = that.resId
           },
         })
       } else {
-        this.reload({
-          resId: value
-        })
+        this.reload(params)
       }
     },
     // 保存文档
@@ -415,15 +545,19 @@ export default {
           dataMode: this.dataMode,
           resId: this.resId,
           modifyResModel: this.modifyResModel,
-          logicExtraParams: this.logicExtraParams
+          logicExtraParams: this.logicExtraParams,
+          is_template: this.isTemplate,
+          f_file_name: this.fileName
         }
         // 保存HTML文档和结构化数据到后端服务
         runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
           this.$message.success('保存成功')
+          console.log('保存成功', )
           this.changeRes(res.currResData.id)
           this.$emit('saveafter', data.dataObject)
         }).finally(() => {
           this.resDataModalVisible = false
+          this.saveVisible = false
         })
       } else {
         this.$message.error('请检查未填写的项目')
@@ -456,4 +590,49 @@ export default {
 :deep(.ant-divider-horizontal) {
   margin: 4px 0;
 }
+/* 组合按钮容器 */
+.combined-save-btn {
+  display: inline-flex;
+  position: relative;
+  height: 32px; /* 标准按钮高度 */
+}
+
+/* 主保存按钮（保持原有样式，只调整右边框） */
+.save-btn-main {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-right: none;
+  padding-right: 24px; /* 为下拉图标留空间 */
+  height: 100%;
+}
+
+/* 下拉触发区域 */
+.dropdown-trigger {
+  position: absolute;
+  right: 0;
+  top: 0;
+  height: 100%;
+  width: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #1890ff; /* 与主按钮颜色一致 */
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  cursor: pointer;
+  border-left: 1px solid rgba(255,255,255,0.3);
+}
+
+/* 下拉图标 */
+.dropdown-trigger .anticon {
+  font-size: 12px;
+  color: #fff;
+}
+
+/* 悬停效果 */
+.combined-save-btn:hover .save-btn-main,
+.combined-save-btn:hover .dropdown-trigger {
+  background: #40a9ff;
+  border-color: #40a9ff;
+}
 </style>

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/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
+}