vue2-client 1.16.99 → 1.17.1

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

@@ -579,6 +579,7 @@ export default {
           this.$refs.xTable.init({
             formItems: res.formJson,
             queryParams: setQueryParams ? res : null,
+            realQueryParams: res,
             tableColumns: res.columnJson,
             buttonState: Object.assign(res.buttonState, this.buttonState),
             title: this.title || res.title,

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

@@ -1,89 +1,89 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例表单"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      :externalSelectedRowKeys="selectedKeys"
-      @action="action"
-      @selectRow="selectRow"
-      @columnClick="columnClick"
-      serviceName="af-revenue"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { microDispatch } from '@vue2-client/utils/microAppUtils'
-
-export default {
-  name: 'Demo',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'testSqlCRUD',
-      // 查询配置左侧tree
-      xTreeConfigName: 'addressType',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {},
-      // 选中的行keys
-      selectedKeys: [],
-      selected: {
-        keys: [],
-        rows: []
-      }
-    }
-  },
-  methods: {
-    test () {
-      this.$refs.xFormTable.setTableData([])
-    },
-    defaultF () {
-      this.$refs.xFormTable.setTableSize('default')
-    },
-    middleF () {
-      this.$refs.xFormTable.setTableSize('middle')
-    },
-    smallF () {
-      this.$refs.xFormTable.setTableSize('small')
-    },
-    columnClick (key, value, record) {
-      microDispatch({
-        type: 'v3route',
-        path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
-      })
-    },
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    },
-    selectRow (selectedRowKeys, selectedRows) {
-      this.selected = {
-        keys: selectedRowKeys,
-        rows: selectedRows
-      }
-      console.log('selectedDemo', this.selected)
-    },
-  },
-  computed: {},
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例表单"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      :externalSelectedRowKeys="selectedKeys"
+      @action="action"
+      @selectRow="selectRow"
+      @columnClick="columnClick"
+      serviceName="af-system"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
+
+export default {
+  name: 'Demo',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ceshiCRUD',
+      // 查询配置左侧tree
+      xTreeConfigName: 'addressType',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {},
+      // 选中的行keys
+      selectedKeys: [],
+      selected: {
+        keys: [],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    test () {
+      this.$refs.xFormTable.setTableData([])
+    },
+    defaultF () {
+      this.$refs.xFormTable.setTableSize('default')
+    },
+    middleF () {
+      this.$refs.xFormTable.setTableSize('middle')
+    },
+    smallF () {
+      this.$refs.xFormTable.setTableSize('small')
+    },
+    columnClick (key, value, record) {
+      microDispatch({
+        type: 'v3route',
+        path: '/bingliguanli/dianzibingliluru',
+        props: { selected: arguments[0].his_f_admission_id }
+      })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.selected = {
+        keys: selectedRowKeys,
+        rows: selectedRows
+      }
+      console.log('selectedDemo', this.selected)
+    },
+  },
+  computed: {},
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -145,6 +145,17 @@
             <a-tooltip title="列展示/排序" placement="bottom">
               <table-setting v-if="columnSelectLoaded" v-model="tableColumns"/>
             </a-tooltip>
+            <a-popover title="开发者调试信息" placement="bottomRight" v-if="!isDebugUser()">
+              <template slot="content">
+                <p>租户：{{ realQueryParams.$globalProp.tenantAlias }}</p>
+                <p>命名空间：{{ realQueryParams.$globalProp.namespaceName }} - {{ realQueryParams.$globalProp.module }}</p>
+                <p>配置名称：{{ queryParamsName }}</p>
+                <p>版本号：{{ realQueryParams.$globalProp.version }}</p>
+              </template>
+              <a-button>
+                <a-icon :style="iconStyle" type="bug"/>
+              </a-button>
+            </a-popover>
           </a-button-group>
         </span>
       </a-col>
@@ -296,6 +307,7 @@ import ExportExcel from '@vue2-client/base-client/components/common/XTable/Expor
 import g2Charts from '@vue2-client/components/g2Charts/index.vue'
 import moment from 'moment/moment'
 import XTableWrapper from './XTableWrapper.vue'
+import {isDebugUser} from "@/utils/common";
 
 export default {
   name: 'XTable',
@@ -456,6 +468,7 @@ export default {
       // crud打印模板配置
       printTemplate: false,
       queryParams: {},
+      realQueryParams: {},
       // 定义总行数
       totalCount: 0,
       user: {},
@@ -595,6 +608,7 @@ export default {
     window.removeEventListener('resize', this.handleResize)
   },
   methods: {
+    isDebugUser,
     showTempData () {
       this.selectedRowModalVisible = true
       this.$nextTick(() => {
@@ -729,6 +743,7 @@ export default {
       const {
         // 查询参数对象, 用于没有对应查询配置文件名时
         queryParams,
+        realQueryParams,
         tableColumns,
         attachGrid,
         expandedGrid,
@@ -799,6 +814,7 @@ export default {
         this.sortSummaryData()
       }
       this.queryParams = queryParams
+      this.realQueryParams = realQueryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
       if (this.tableColumns.length === 0) {
         return

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

@@ -1,6 +1,28 @@
   <template>
     <div class="x-radio-container" :class="wrapperClassObject()">
-      <a-radio-group v-model="innerValue" @change="onChange" :class="['x-radio-group', { 'x-radio-group-left': config.alignLeft }]">
+      <!-- 按钮模式 -->
+      <a-radio-group
+        v-if="config.buttonMode"
+        v-model="innerValue"
+        @change="onChange"
+        :class="['x-radio-group', 'x-radio-group-button', { 'x-radio-group-left': config.alignLeft }]"
+        button-style="solid">
+        <a-radio-button
+          v-for="item in data"
+          :key="item.value"
+          :value="item.value"
+          class="x-radio-button-item"
+        >
+          {{ item.label }}
+        </a-radio-button>
+      </a-radio-group>
+
+      <!-- 普通模式 -->
+      <a-radio-group
+        v-else
+        v-model="innerValue"
+        @change="onChange"
+        :class="['x-radio-group', { 'x-radio-group-left': config.alignLeft }]">
         <div
           v-for="item in data"
           :key="item.value"
@@ -66,7 +88,8 @@
           indicatorActiveColor: '#1890ff',
           alignLeft: false,
           showBorder: false,
-          highlightBorder: false
+          highlightBorder: false,
+          buttonMode: false
         }
       }
     },
@@ -106,7 +129,11 @@
                 }
               }
             }
-            // 4. 初始化默认值（优先级： 配置defaultValue > 第一个选项）
+            // 4. 加载按钮模式配置
+            if (res.buttonMode !== undefined) {
+              this.config.buttonMode = res.buttonMode
+            }
+            // 5. 初始化默认值（优先级： 配置defaultValue > 第一个选项）
             if (this.value !== undefined && this.value !== null) {
               this.innerValue = this.value // 优先使用外部传入的 value
             } else if (res.defaultValue !== undefined && res.defaultValue !== null) {
@@ -116,7 +143,7 @@
               // 如果没有默认值但有选项，使用第一个选项
               this.innerValue = this.data[0].value
             }
-            // 5. 触发初始化事件
+            // 6. 触发初始化事件
             this.$emit('init', this.innerValue)
           } else {
             this.$message.error('配置错误，radio字段不是数组')
@@ -177,6 +204,62 @@
     &.x-radio-group-left {
       justify-content: flex-start;
     }
+
+    &.x-radio-group-button {
+      display: flex;
+      justify-content: flex-end; // 居右对齐
+      gap: 0; // 移除间距，让按钮紧密相连
+      &.x-radio-group-left {
+        justify-content: flex-start;
+      }
+      :deep(.ant-radio-button-wrapper) {
+        border-radius: 0; // 先移除所有圆角
+        border: 1px solid #d9d9d9;
+        background: #fff;
+        color: #000;
+        transition: all 0.3s;
+        min-width: 80px;
+        text-align: center;
+        margin: 0; // 确保没有外边距
+
+        &:hover {
+          border-color: #40a9ff;
+          color: #40a9ff;
+        }
+
+        &.ant-radio-button-wrapper-checked {
+          background-color: #0057FE;
+          border-color: #0057FE;
+          color: #fff;
+
+          &:hover {
+            background-color: #0057FE;
+            border-color: #0057FE;
+            color: #fff;
+          }
+        }
+        // 第一个按钮只保留左侧圆角
+        &:first-child {
+          border-top-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+          border-right: none; // 移除右边框，与下一个按钮连接
+        }
+        // 最后一个按钮只保留右侧圆角
+        &:last-child {
+          border-top-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+        }
+        // 中间按钮（如果有）移除所有圆角和右边框
+        &:not(:first-child):not(:last-child) {
+          border-radius: 0;
+          border-right: none;
+        }
+        // 除了最后一个按钮，其他按钮都移除右边框
+        &:not(:last-child) {
+          border-right: none;
+        }
+      }
+    }
   }
 
   .x-radio-item-container {
@@ -291,6 +374,7 @@
     transition: all 0.3s;
     max-width: 100%;
   }
+
   .x-radio-description {
     padding: 4px 4px 4px 4px;
   }

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

@@ -299,14 +299,16 @@ onMounted(() => {
   height: 2px;
 }
 .x-title-compact {
-  height: 23px;
-  opacity: 1;
-  font-family: "Source Han Sans";
-  font-size: 16px;
-  font-weight: bold;
-  line-height: normal;
-  letter-spacing: 0em;
-  font-feature-settings: "kern" on;
-  color: #313131;
+  :deep(.x-title){
+    height: 23px;
+    opacity: 1;
+    font-family: "Source Han Sans";
+    font-size: 16px !important;
+    font-weight: 600;
+    line-height: normal;
+    letter-spacing: 0em;
+    font-feature-settings: "kern" on;
+    color: #313131;
+  }
 }
 </style>

package/src/utils/common.js

@@ -1,4 +1,6 @@
 // 验证是否为blob格式
+import Vue from 'vue'
+
 export async function blobValidate (data) {
   try {
     const text = await data.text()
@@ -8,3 +10,9 @@ export async function blobValidate (data) {
     return true
   }
 }
+
+export function isDebugUser () {
+  const store = Vue.$store
+  const currUser = store.state.account?.user
+  return currUser.name === '1' || currUser.rolesnames.indexOf('运维人员') > -1
+}