vue2-client 1.15.48 → 1.15.50

package/package.json

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

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -1054,7 +1054,11 @@ export default {
             this.getDataCallback(
               res.filter(h => {
                   if (fromModel.indexOf('org') > -1) {
-                    return formModelData?.includes(h.orgid || h.f_organization_id || h.parentid)
+                    if (type === '部门') {
+                      return formModelData?.includes(h.orgid || h.f_organization_id) || formModelData?.includes(h.parentid)
+                    } else {
+                      return formModelData?.includes(h.orgid || h.f_organization_id || h.parentid)
+                    }
                   } else {
                     return formModelData?.includes(h?.parentid)
                   }

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

@@ -315,7 +315,11 @@ export default {
               return k === key
             })
             if (!col || !col.width || col.slotType === 'action') {
-              return h('th', { ...restProps }, [...children])
+              if (children) {
+                return h('th', { ...restProps }, [...children])
+              } else {
+                return h('th', { ...restProps })
+              }
             }
 
             // 创建一个防止点击排序的容器
@@ -407,7 +411,11 @@ export default {
               }
             }
 
-            return h('th', { ...newRestProps, class: 'resize-table-th' }, [...children, preventSort, drag])
+            if (children) {
+              return h('th', { ...newRestProps, class: 'resize-table-th' }, [...children, preventSort, drag])
+            } else {
+              return h('th', { ...newRestProps, class: 'resize-table-th' }, [preventSort, drag])
+            }
           },
         }
       }

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>

package/src/base-client/components/his/XTreeRows/TreeNode.vue

@@ -1,100 +1,100 @@
-<template>
-  <div class="tree-node">
-    <div class="node-content" @click="handleClick">
-      <span v-if="hasChildren" class="toggle-icon">
-        {{ node.expanded ? '-' : '+' }}
-      </span>
-      <span v-else class="empty-space"></span>
-      <span class="node-title" :title="node.title">{{ node.title }}</span>
-    </div>
-    <div v-if="hasChildren && node.expanded" class="node-children">
-      <tree-node
-        v-for="child in node.children"
-        :key="child.id"
-        :node="child"
-        @toggle="handleToggle"
-        :level="level + 1"/>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'TreeNode',
-  props: {
-    node: {
-      type: Object,
-      required: true
-    },
-    level: {
-      type: Number,
-      default: 0
-    }
-  },
-  computed: {
-    hasChildren () {
-      return this.node.children && this.node.children.length > 0
-    }
-  },
-  methods: {
-    handleClick () {
-      if (this.hasChildren) {
-        this.$emit('toggle', this.node)
-      }
-    },
-    handleToggle (childNode) {
-      this.$emit('toggle', childNode)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tree-node {
-  margin: 1px 0;
-  white-space: nowrap;
-}
-
-.node-content {
-  display: flex;
-  align-items: center;
-  padding: 3px 2px;
-  user-select: none;
-  border-radius: 2px;
-  overflow: hidden;
-}
-
-.toggle-icon {
-  width: 12px;
-  text-align: center;
-  font-size: 14px;
-  color:#5D5C5C;
-  font-weight: 400;
-  margin-right: 3px;
-  cursor: pointer;
-  flex-shrink: 0;
-}
-
-.empty-space {
-  width: 12px;
-  margin-right: 3px;
-  flex-shrink: 0;
-}
-
-.node-title {
-  flex: 1;
-  cursor: default;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  min-width: 0;
-}
-
-.node-content:hover {
-  background-color: #f5f5f5;
-}
-
-.node-children {
-  padding-left: 15px;
-}
-</style>
+<template>
+  <div class="tree-node">
+    <div class="node-content" @click="handleClick">
+      <span v-if="hasChildren" class="toggle-icon">
+        {{ node.expanded ? '-' : '+' }}
+      </span>
+      <span v-else class="empty-space"></span>
+      <span class="node-title" :title="node.title">{{ node.title }}</span>
+    </div>
+    <div v-if="hasChildren && node.expanded" class="node-children">
+      <tree-node
+        v-for="child in node.children"
+        :key="child.id"
+        :node="child"
+        @toggle="handleToggle"
+        :level="level + 1"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TreeNode',
+  props: {
+    node: {
+      type: Object,
+      required: true
+    },
+    level: {
+      type: Number,
+      default: 0
+    }
+  },
+  computed: {
+    hasChildren () {
+      return this.node.children && this.node.children.length > 0
+    }
+  },
+  methods: {
+    handleClick () {
+      if (this.hasChildren) {
+        this.$emit('toggle', this.node)
+      }
+    },
+    handleToggle (childNode) {
+      this.$emit('toggle', childNode)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tree-node {
+  margin: 1px 0;
+  white-space: nowrap;
+}
+
+.node-content {
+  display: flex;
+  align-items: center;
+  padding: 3px 2px;
+  user-select: none;
+  border-radius: 2px;
+  overflow: hidden;
+}
+
+.toggle-icon {
+  width: 12px;
+  text-align: center;
+  font-size: 14px;
+  color:#5D5C5C;
+  font-weight: 400;
+  margin-right: 3px;
+  cursor: pointer;
+  flex-shrink: 0;
+}
+
+.empty-space {
+  width: 12px;
+  margin-right: 3px;
+  flex-shrink: 0;
+}
+
+.node-title {
+  flex: 1;
+  cursor: default;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  min-width: 0;
+}
+
+.node-content:hover {
+  background-color: #f5f5f5;
+}
+
+.node-children {
+  padding-left: 15px;
+}
+</style>