vue2-client 1.15.2 → 1.15.4

package/src/base-client/components/TreeList/TreeNode.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="tree-node">
+    <div class="node-content" @click="handleClick">
+      <span v-if="hasChildren" class="toggle-icon">
+        {{ node.expanded ? '-' : '+' }}
+      </span>
+      <span class="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="$emit('toggle', $event)"
+        :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)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tree-node {
+  margin: 2px 0;
+}
+
+.node-content {
+  display: flex;
+  align-items: center;
+  padding: 4px 0;
+  user-select: none;
+}
+
+.toggle-icon {
+  width: 16px;
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+  margin-right: 4px;
+  cursor: pointer;
+}
+
+.node-title {
+  flex: 1;
+  cursor: default;
+}
+
+.node-content:hover {
+  background-color: #f5f5f5;
+}
+
+.node-children {
+  padding-left: 20px;
+}
+</style> 

package/src/base-client/components/common/XCardSet/XTiltle.vue

@@ -0,0 +1,191 @@
+<template>
+  <a-row
+    class="title_box"
+    :style="{backgroundColor: requiredParameters.backgroundColor,height:requiredParameters.height}"
+    type="flex"
+    v-model="requiredParameters">
+    <a-col class="title_col_left" :flex="3">
+      <div class="title_img_box">
+        <img src="../img/header10086.png" class="title_img" alt="">
+      </div>
+      <div class="title_name">{{ requiredParameters.title }}</div>
+    </a-col>
+    <a-col class="title_col_right" id="titleSelect" :flex="3" style="padding-right: 3%" v-model="dateData">
+      <div class="title_date_box">
+        <div class="title_data">{{ dateData.date }}</div>
+        <div class="title_week">{{ dateData.dayOfWeek }}</div>
+      </div>
+      <div class="title_time">{{ dateData.time }}</div>
+      <div style="font-size: x-large;margin-left: 1%">|</div>
+      <div class="title_refresh" @click="refreshTitle"><a-icon type="undo" style="font-size: x-large;"/></div>
+      <div class="title_refresh_box">
+        <div class="title_refresh_time">{{ dateData.refreshTime }}</div>
+        <div class="latest_update_time">最新更新时间</div>
+      </div>
+    </a-col>
+  </a-row>
+</template>
+
+<script>
+
+export default {
+  name: 'TitleComponent',
+  components: {},
+  data () {
+    return {
+      dateData: {
+        date: '',
+        dayOfWeek: '',
+        time: '',
+        refreshTime: ''
+      },
+      timer: null
+    }
+  },
+  props: {
+    requiredParameters: {
+      type: Object,
+      default: () => ({
+        title: '',
+        backgroundColor: '',
+        height: ''
+      }),
+    }
+  },
+  created () {
+    this.updateDateData()
+    this.startTimer()
+  },
+  beforeDestroy () {
+    this.stopTimer()
+  },
+  methods: {
+    // 刷新页面
+    refreshTitle () {
+      this.$forceUpdate()
+      const now = new Date()
+      this.dateData.refreshTime = now.toLocaleTimeString()
+      this.$emit('refreshTitle')
+    },
+    updateDateData () {
+      const now = new Date()
+      const options = { weekday: 'long' }
+      this.dateData.date = this.formatDate(now)
+      this.dateData.time = this.formatTime(now)
+      this.dateData.dayOfWeek = now.toLocaleDateString(undefined, options)
+      this.dateData.refreshTime = now.toLocaleTimeString()
+    },
+    formatDate (date) {
+      const month = date.getMonth() + 1
+      const day = date.getDate()
+      return `${month}月${day}日`
+    },
+    formatTime (date) {
+      const hours = String(date.getHours()).padStart(2, '0')
+      const minutes = String(date.getMinutes()).padStart(2, '0')
+      return `${hours}:${minutes}`
+    },
+    startTimer () {
+      this.timer = setInterval(() => {
+        const now = new Date()
+        this.dateData.time = this.formatTime(now)
+      }, 10000) // 每秒更新一次
+    },
+    stopTimer () {
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = null
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title_box {
+  width: 100%;
+  min-height:42px;
+}
+.title_col_left {
+  height: 100%;
+  color: white;
+  display: flex;
+  align-content: center;
+  align-items: center;
+}
+.title_col_right {
+  height: 100%;
+  color: white;
+  display: flex;
+  align-content: center;
+  align-items: center;
+  justify-content: flex-end;
+}
+.title_img_box {
+  height: 80%;
+  width: auto;
+  margin-left: 1%;
+  border-radius: 50%;
+  background-color: #35baf6;
+}
+.title_img{
+  width: 100%;
+  height: 100%;
+}
+.title_name {
+  font-size: medium !important;
+  font-weight: bold;
+  margin-left: 1%;
+}
+.title_date_box{
+  width: 20%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.title_data{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: smaller;
+}
+.title_week{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: smaller;
+}
+.title_time{
+  font-size: x-large;
+}
+.title_refresh{
+  margin-left: 1%;
+  height: 100%;
+  align-content: center;
+  align-items: center;
+  cursor: pointer;
+  display: flex;
+  width: 7%;
+  justify-content: center;
+  min-width: 31px;
+}
+.title_refresh:hover{
+  background-color: rgb(31, 138, 137);
+}
+.title_refresh:active{
+  background-color: rgb(26, 129, 128);
+}
+.title_refresh_box{
+  margin-right: 1%;
+}
+.latest_update_time{
+  font-size: x-small;
+}
+.title_refresh_time{
+  display: flex;
+  font-size: x-small;
+  align-content: center;
+  justify-content: center;
+}
+</style>

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

@@ -200,6 +200,22 @@ export default {
         return { id: null, name: 'Guest' }
       },
     },
+
+    /**
+     * 祖先组件注入的自定义函数对象
+     * 此对象包含祖先组件通过provide/inject机制注入的各种自定义函数
+     * 子组件可以通过this.generalFunction来访问这些函数
+     * 使用示例：
+     * - this.generalFunction.handleCustomEvent(data)
+     * - this.generalFunction.submitForm(formData)
+     * - this.generalFunction.validateData(data)
+     */
+    generalFunction: {
+      default: () => {
+        console.warn('generalFunction is not provided.')
+        return null
+      }
+    }
   },
   data () {
     return {

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

@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'userInfosCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉
@@ -33,7 +33,7 @@ export default {
       // 当前记录
       record: {},
       // 选中的行keys
-      selectedKeys: ['813200000004', '72547', '72455', '72451'],
+      selectedKeys: [],
       selected: {
         keys: [],
         rows: []

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

@@ -461,7 +461,9 @@ export default {
       clearSelectRowAfterQuery: false,
       selectedRowModalVisible: false,
       // 是否禁用右侧操作行为
-      disableAction: false
+      disableAction: false,
+      // 中文字段名列表
+      chineseQueryColumnArray: []
     }
   },
   props: {
@@ -743,7 +745,8 @@ export default {
         selectRowMode = 'default',
         tableSize = 'default',
         clearSelectRowAfterQuery = false,
-        disableAction = false
+        disableAction = false,
+        chineseQueryColumnArray = []
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       if (this.showSummary) {
@@ -770,6 +773,10 @@ export default {
         this.showCustomSummary = true
         this.customSummaryArray = customTableSummaryArray
       }
+      this.chineseQueryColumnArray = chineseQueryColumnArray
+      if (this.summaryData.length > 0) {
+        this.sortSummaryData()
+      }
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
       if (this.tableColumns.length === 0) {
@@ -1386,6 +1393,15 @@ export default {
       await Promise.all(promises)
       return this.summaryData
     },
+    sortSummaryData () {
+      const result = this.summaryData
+      // 过滤出 result 中实际存在的 title，并按照 fieldsArray 的顺序排序
+      this.summaryData = [...result].sort((a, b) => {
+        const indexA = this.chineseQueryColumnArray.indexOf(a.title)
+        const indexB = this.chineseQueryColumnArray.indexOf(b.title)
+        return indexA - indexB
+      })
+    },
     showDrawer () {
       if (this.summaryUpdate) {
         this.summaryData.forEach(item => {

package/src/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.vue

@@ -14,9 +14,9 @@ export default {
     init () {
       console.log(this)
       const conditionData = {
-        tmp_1: { tmp_id: 1 },
-        tmp_2: { tmp_id: 2 },
-        tmp_3: { tmp_id: 3 }
+        tmp_1: { tmp_id: 1, data_id: 17 },
+        tmp_2: { tmp_id: 2, data_id: 17 },
+        tmp_3: { tmp_id: 3, data_id: 17 }
       }
       this.$refs.questionnaireRef.init(conditionData)
     },

package/src/base-client/components/his/XQuestionnaire/XQuestionnaireItem.vue

@@ -29,13 +29,14 @@
             <template v-else-if="column.type === 'radio'">
               <x-radio
                 :class="['column-item']"
+                :value="column.value"
                 :key="`row-${index}-item-${idx}`"
                 :queryParamsName="column.configName"
                 @change="handleChange($event,column)">
               </x-radio>
             </template>
             <template v-else-if="column.type === 'time'">
-              <x-time-select :key="`row-${index}-item-${idx}`" :class="['column-item']" @change="handleChange($event,column)" :queryParamsName="column.configName">
+              <x-time-select :key="`row-${index}-item-${idx}`" :value="column.value" :class="['column-item']" @change="handleChange($event,column)" :queryParamsName="column.configName">
               </x-time-select>
             </template>
             <template v-else-if="column.type === 'text'">
@@ -112,9 +113,7 @@ export default {
     async getData (config, param) {
       const that = this
       that.config = { ...that.config, ...config }
-      console.log(param)
       runLogic(config.data, param, 'af-his').then(res => {
-        that.data = res || []
         that.results = {}
         // 将又返回值的数据创建到results
         for (let i = 0; i < res.length; i++) {
@@ -130,12 +129,28 @@ export default {
               console.error(`Config_id 冲突: ${field.config_id} 重复,同一个模板中不能有形同的配置项`)
               return
             }
-            if (field.type === 'selectionBox' || field.type === 'input' || field.type === 'radio' || field.type === 'time') {
-              this.results[field.config_id] = { value: field.value, data_id: field.data_id }
+            let value_
+            if (field.type === 'selectionBox') {
+              value_ = field.value === 'true' // 将字符串转为布尔值
+            } else if (field.type === 'radio') {
+              value_ = parseInt(field.value) || 0
+            } else if (field.type === 'time') {
+              value_ = field.value ? JSON.parse(field.value) : []
+            } else {
+              value_ = field.value
+            }
+            // 将符合条件的字段存入results
+            if (['selectionBox', 'input', 'radio', 'time'].includes(field.type)) {
+              this.results[field.config_id] = {
+                value: value_,
+                data_id: field.data_id
+              }
             }
+            field.value = value_
             console.log(this.results)
           }
         }
+        that.data = res || []
       })
     },
     refreshList (param) {
@@ -151,6 +166,7 @@ export default {
     },
     // 数据发生改变--将修改后的值填充到results
     handleChange (e, column) {
+      console.log('数据发生改变:', e, column)
       if (column.type === 'selectionBox') {
         this.results[column.config_id].value = e.target.checked
       } else if (column.type === 'input') {

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

@@ -68,7 +68,9 @@ export default {
             }
           }
           // 3. 初始化默认值（优先级： 配置defaultValue > 第一个选项）
-          if (res.defaultValue !== undefined && res.defaultValue !== null) {
+          if (this.value !== undefined && this.value !== null) {
+            this.innerValue = this.value // 优先使用外部传入的 value
+          } else if (res.defaultValue !== undefined && res.defaultValue !== null) {
             // 使用配置中的defaultValue
             this.innerValue = res.defaultValue
           } else if (this.data.length > 0) {