vue2-client 1.15.67 → 1.15.70

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

@@ -19,16 +19,6 @@
 - getOutEnv 获取获取 outEnv
 - this.getRealKeyData(obj) 获取真实的数据 传递 {a_a:"1"} 返回 {a:"1"}
 - this.currUser.operaInfo 获取当前用户信息
-  - ```js
-    {
-      f_operator: "心血管内科医生2",
-      f_operatorid: "387280281096290306",
-      f_orgid: "387184994751217666",
-      f_orgname: "门诊部",
-      f_depid: "387185267599081474",
-      f_depname: "心血管内科"
-    }
-    ```
 
 ```js
 this.openDialog('xxx', 5, {}, {}, {})

package/package.json

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

package/src/base-client/components/common/XFormTable/demo.vue

@@ -8,7 +8,7 @@
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-liuli"
+      serviceName="af-system"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'crud_namespace_manage',
+      queryParamsName: 'ceshiCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -98,7 +98,7 @@
       </span>
       <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
         <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
+          <a-dropdown placement="bottomCenter" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
               {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
             </a>

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

@@ -44,7 +44,7 @@
                 重命名
               </a-button>
               <!-- 组合按钮容器 -->
-              <div class="combined-save-btn">
+              <div class="save-btn-main">
                 <!-- 保存按钮 (左侧) -->
                 <a-button
                   type="primary"
@@ -62,7 +62,7 @@
                     placement="bottomRight">
                     <a-button
                       type="primary"
-                      class="save-btn-dropdown">
+                      class="dropdown-trigger-btn">
                       <a-icon type="down" />
                     </a-button>
                     <a-menu slot="overlay">
@@ -76,7 +76,7 @@
               <a-modal
                 title="保存"
                 :visible="saveVisible"
-                :confirm-loading="confirmLoading"
+                confirm-loading = false
                 @ok="handleSaveConfirm"
                 @cancel="saveVisible = false"
               >
@@ -179,7 +179,6 @@ export default {
       admissionId: undefined,
       // 保存类型
       saveType: 'normal',
-      confirmLoading: false,
       fileName: '',
       // 数据模式列表
       modeList: [
@@ -301,24 +300,23 @@ 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 (type === 'template') {
+        this.saveVisible = true
+      }else {
         if (this.resId !== -1 || this.resId !== undefined) {
-          this.save();
+          this.save()
         } else {
-          this.openAddResModal();
+          this.openAddResModal()
         }
-      } else if (this.saveType === 'template') {
-        this.saveAsTemplate();
       }
+
+    },
+    handleSaveConfirm () {
+      if (!this.fileName.trim()) {
+        this.$message.error('文件名不能为空')
+        return
+      }
+      this.saveAsTemplate()
     },
     /* eslint-disable */
     // 初始化文档
@@ -500,7 +498,7 @@ export default {
         return;
       }
       this.editorRef.setBindObject(this.assignBindObject)
-      console.log('resId', this.resId)
+      // console.log('resId', this.resId)
     },
     // 切换文档
     changeRes (value) {
@@ -590,49 +588,43 @@ export default {
 :deep(.ant-divider-horizontal) {
   margin: 4px 0;
 }
-/* 组合按钮容器 */
+/* 组合按钮容器 - 关键修正 */
 .combined-save-btn {
   display: inline-flex;
-  position: relative;
-  height: 32px; /* 标准按钮高度 */
+  height: 32px;
 }
 
-/* 主保存按钮（保持原有样式，只调整右边框） */
+/* 主保存按钮 - 保持原有样式 */
 .save-btn-main {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right: none;
-  padding-right: 24px; /* 为下拉图标留空间 */
-  height: 100%;
+  border-top-right-radius: 0 !important;
+  border-bottom-right-radius: 0 !important;
+  border-right: none !important;
+  height: 32px;
+  padding: 0 15px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: -1px; /* 关键：负边距消除间距 */
 }
 
-/* 下拉触发区域 */
-.dropdown-trigger {
-  position: absolute;
-  right: 0;
-  top: 0;
-  height: 100%;
-  width: 24px;
-  display: flex;
+/* 下拉按钮 - 仅调整间距 */
+.dropdown-trigger-btn {
+  height: 32px !important;
+  width: 24px !important;
+  min-width: 24px !important;
+  padding: 0 !important;
+  border-top-left-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
+  border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
+  display: inline-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);
+  margin-left: 0px;
 }
 
-/* 下拉图标 */
-.dropdown-trigger .anticon {
+/* 下拉图标保持原样 */
+.dropdown-trigger-btn .anticon {
   font-size: 12px;
-  color: #fff;
-}
-
-/* 悬停效果 */
-.combined-save-btn:hover .save-btn-main,
-.combined-save-btn:hover .dropdown-trigger {
-  background: #40a9ff;
-  border-color: #40a9ff;
+  margin: 0 !important;
 }
 </style>

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

@@ -1,207 +1,207 @@
-<template>
-  <div>
-    <div class="text-card">
-      <div
-        v-for="(item, index) in displayItems"
-        :key="index"
-        class="text-item"
-        @click="handleItemClick(index, item.id)"
-        @contextmenu.prevent="handleContextMenu(index, item.id)">
-        <div class="text-content" :class="{ 'is-empty': !item.content }">
-          {{ item.content || '+' }}
-        </div>
-      </div>
-      <!-- 编辑弹出框 -->
-      <div
-        v-if="showEdit"
-        class="edit-overlay"
-        @click.self="handleOverlayClick">
-        <div class="edit-card">
-          <a-textarea
-            v-model="editingContent"
-            :autoSize="{ minRows: 3 }"
-            @keyup.enter="handleSave"
-            ref="textarea"/>
-        </div>
-      </div>
-      <!-- 删除确认弹框 -->
-      <a-modal
-        v-model="showDeleteModal"
-        title="确认删除"
-        okText="确认"
-        cancelText="取消"
-        @ok="handleDeleteConfirm">
-        <p>确定要删除这条内容吗？</p>
-      </a-modal>
-    </div>
-  </div>
-</template>
-
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XTextCard',
-  props: {
-    // logic配置名,要求返回一个数组[{ id: , content: }]
-    queryParamsName: {
-      type: String,
-      default: 'memorandumLOGIC'
-    },
-    queryParams: {
-      type: Object,
-      default: () => { return {} }
-    },
-    // 请求参数
-    parameter: {
-      type: Object,
-      default: () => { return {} }
-    }
-  },
-  data () {
-    return {
-      localItems: [], // 本地数据
-      showEdit: false, // 是否显示编辑框
-      editingIndex: -1, // 当前编辑的索引
-      editingContent: '', // 编辑框的内容
-      showDeleteModal: false, // 是否显示删除确认框
-      deleteIndex: -1, // 要删除的项目索引
-      ID: 0
-    }
-  },
-  computed: {
-    // 显示的列表，始终保持一个空行
-    displayItems () {
-      const items = [...this.localItems]
-      // 如果最后一项不是空的，添加一个空项
-      if (!items.length || items[items.length - 1].content) {
-        items.push({ content: '' })
-      }
-      return items
-    }
-  },
-  methods: {
-    // 点击项目
-    handleItemClick (index, id) {
-      this.ID = id
-      this.editingIndex = index
-      this.editingContent = this.displayItems[index].content
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.textarea?.focus()
-      })
-    },
-    // 点击遮罩层保存
-    handleOverlayClick () {
-      this.handleSave()
-    },
-    // 保存内容
-    handleSave () {
-      if (this.editingContent.trim()) {
-        if (this.editingIndex === this.localItems.length) {
-          // 如果是在最后一个空行添加，push新内容
-          this.localItems.push({ content: this.editingContent.trim() })
-        } else {
-          // 否则更新现有内容
-          this.localItems[this.editingIndex].content = this.editingContent.trim()
-        }
-        const addData = { data: this.editingContent.trim(), ID: this.ID }
-        // 触发更新事件
-        this.$emit('add', addData)
-      }
-      this.showEdit = false
-      this.editingIndex = -1
-      this.editingContent = ''
-    },
-    // 初始化数据
-    async initData (data, parameter) {
-      // 从配置中获取数据
-      const resData = await runLogic(data, parameter, 'af-his')
-      this.localItems = resData
-      return resData
-    },
-    // 处理右键菜单
-    handleContextMenu (index, id) {
-      // 如果是最后一个空行，不显示删除框
-      if (index === this.localItems.length) {
-        return
-      }
-      this.ID = id
-      this.deleteIndex = index
-      this.showDeleteModal = true
-    },
-    // 确认删除
-    handleDeleteConfirm () {
-      if (this.deleteIndex > -1) {
-        this.localItems.splice(this.deleteIndex, 1)
-        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
-        this.$emit('deleteData', deleteData)
-        this.deleteIndex = -1
-      }
-      this.showDeleteModal = false
-    }
-  },
-  watch: {
-    queryParamsName: {
-      immediate: true,
-      handler (newVal) {
-        this.initData(newVal, this.parameter)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.text-card {
-  position: relative;
-  width: 100%;
-  .text-item {
-    padding: 8px 12px;
-    border-bottom: 1px solid #f0f0f0;
-    cursor: pointer;
-    transition: all 0.3s;
-    user-select: none;
-
-    &:hover {
-      background-color: #f5f5f5;
-    }
-
-    .text-content {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      line-height: 1.5;
-
-      &.is-empty {
-        color: #5D5C5C;
-        font-weight: 400;
-      }
-    }
-  }
-  .edit-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.45);
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    .edit-card {
-      background: white;
-      padding: 16px;
-      border-radius: 8px;
-      width: 90%;
-      max-width: 500px;
-      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
-      .ant-input {
-        width: 100%;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <div class="text-card">
+      <div
+        v-for="(item, index) in displayItems"
+        :key="index"
+        class="text-item"
+        @click="handleItemClick(index, item.id)"
+        @contextmenu.prevent="handleContextMenu(index, item.id)">
+        <div class="text-content" :class="{ 'is-empty': !item.content }">
+          {{ item.content || '+' }}
+        </div>
+      </div>
+      <!-- 编辑弹出框 -->
+      <div
+        v-if="showEdit"
+        class="edit-overlay"
+        @click.self="handleOverlayClick">
+        <div class="edit-card">
+          <a-textarea
+            v-model="editingContent"
+            :autoSize="{ minRows: 3 }"
+            @keyup.enter="handleSave"
+            ref="textarea"/>
+        </div>
+      </div>
+      <!-- 删除确认弹框 -->
+      <a-modal
+        v-model="showDeleteModal"
+        title="确认删除"
+        okText="确认"
+        cancelText="取消"
+        @ok="handleDeleteConfirm">
+        <p>确定要删除这条内容吗？</p>
+      </a-modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XTextCard',
+  props: {
+    // logic配置名,要求返回一个数组[{ id: , content: }]
+    queryParamsName: {
+      type: String,
+      default: 'memorandumLOGIC'
+    },
+    queryParams: {
+      type: Object,
+      default: () => { return {} }
+    },
+    // 请求参数
+    parameter: {
+      type: Object,
+      default: () => { return {} }
+    }
+  },
+  data () {
+    return {
+      localItems: [], // 本地数据
+      showEdit: false, // 是否显示编辑框
+      editingIndex: -1, // 当前编辑的索引
+      editingContent: '', // 编辑框的内容
+      showDeleteModal: false, // 是否显示删除确认框
+      deleteIndex: -1, // 要删除的项目索引
+      ID: 0
+    }
+  },
+  computed: {
+    // 显示的列表，始终保持一个空行
+    displayItems () {
+      const items = [...this.localItems]
+      // 如果最后一项不是空的，添加一个空项
+      if (!items.length || items[items.length - 1].content) {
+        items.push({ content: '' })
+      }
+      return items
+    }
+  },
+  methods: {
+    // 点击项目
+    handleItemClick (index, id) {
+      this.ID = id
+      this.editingIndex = index
+      this.editingContent = this.displayItems[index].content
+      this.showEdit = true
+      this.$nextTick(() => {
+        this.$refs.textarea?.focus()
+      })
+    },
+    // 点击遮罩层保存
+    handleOverlayClick () {
+      this.handleSave()
+    },
+    // 保存内容
+    handleSave () {
+      if (this.editingContent.trim()) {
+        if (this.editingIndex === this.localItems.length) {
+          // 如果是在最后一个空行添加，push新内容
+          this.localItems.push({ content: this.editingContent.trim() })
+        } else {
+          // 否则更新现有内容
+          this.localItems[this.editingIndex].content = this.editingContent.trim()
+        }
+        const addData = { data: this.editingContent.trim(), ID: this.ID }
+        // 触发更新事件
+        this.$emit('add', addData)
+      }
+      this.showEdit = false
+      this.editingIndex = -1
+      this.editingContent = ''
+    },
+    // 初始化数据
+    async initData (data, parameter) {
+      // 从配置中获取数据
+      const resData = await runLogic(data, parameter, 'af-his')
+      this.localItems = resData
+      return resData
+    },
+    // 处理右键菜单
+    handleContextMenu (index, id) {
+      // 如果是最后一个空行，不显示删除框
+      if (index === this.localItems.length) {
+        return
+      }
+      this.ID = id
+      this.deleteIndex = index
+      this.showDeleteModal = true
+    },
+    // 确认删除
+    handleDeleteConfirm () {
+      if (this.deleteIndex > -1) {
+        this.localItems.splice(this.deleteIndex, 1)
+        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
+        this.$emit('deleteData', deleteData)
+        this.deleteIndex = -1
+      }
+      this.showDeleteModal = false
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (newVal) {
+        this.initData(newVal, this.parameter)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.text-card {
+  position: relative;
+  width: 100%;
+  .text-item {
+    padding: 8px 12px;
+    border-bottom: 1px solid #f0f0f0;
+    cursor: pointer;
+    transition: all 0.3s;
+    user-select: none;
+
+    &:hover {
+      background-color: #f5f5f5;
+    }
+
+    .text-content {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      line-height: 1.5;
+
+      &.is-empty {
+        color: #5D5C5C;
+        font-weight: 400;
+      }
+    }
+  }
+  .edit-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.45);
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .edit-card {
+      background: white;
+      padding: 16px;
+      border-radius: 8px;
+      width: 90%;
+      max-width: 500px;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
+      .ant-input {
+        width: 100%;
+      }
+    }
+  }
+}
+</style>