vue2-client 1.14.95 → 1.14.97

package/src/base-client/components/his/XQuestionnaire/XQuestionnaire.json

@@ -1,37 +1,3 @@
-{
-	"config":{
-	  "title":"",
-	  "split":"",
-	  "style":""//TODO 居中方式
-	},
- 	"content": [
-		{
-      "key":"", //单行记录的标识
-			"style":"",//居中方式
-			"item": [
-				{
-					"type":"",
-					"key": "",
-					"value": {},
-
-					"configName":"", // 通过后端获配置单选多选
-					"button-type":"",
-
-
-				}
-			]
-		}
-	]
-}
 //常量取值 checkBox多选
 type [radio,selectionBox,text,input,time,describe,button]
 style = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
-
-"results": [{
-   "row_key": "",
-   "key": "value"
-  }
-]
-
-
-

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

@@ -1,7 +1,7 @@
 <template>
   <div class="list-container" style="display: flex;">
-    <template v-for="(config, index) in configs">
-      <x-questionnaire-item :fixedQueryForm="conditions[index]" :queryParamsName="config" :ref="el => setItemRef(el, index)" :key="`questionnaire-${index}`"></x-questionnaire-item>
+    <template v-for="(config) in configs">
+      <x-questionnaire-item :key="config.tmp_key" :fixedQueryForm="conditionsMap[config.tmp_key]" :queryParamsName="config" :ref="el => setItemRef(el, config)" @customizeEvent="customizeEvent"></x-questionnaire-item>
     </template>
   </div>
 </template>
@@ -26,38 +26,66 @@ export default {
   data () {
     return {
       configs: [],
-      questionnaireItemRefs: [], // 存储子组件实例
-      conditions: []
+      questionnaireItemRefs: new Map(), // 存储子组件实例
+      conditionsMap: {}
     }
   },
   methods: {
     // 获取配置
-    async getData (queryParamsName, conditions) {
-      const that = this
+    async getData (queryParamsName, conditionData) {
       getConfigByName(queryParamsName, 'af-his', res => {
-        if (res.configs) {
-          that.configs = []
-        }
-        for (let i = 0; i < res.configs.length; i++) {
-          const condition = i < conditions.length ? conditions[i] : {}
-          that.configs.push(res.configs[i])
-          that.conditions.push(condition)
-        }
+        // 清空旧数据
+        this.configs = []
+        this.conditionsMap = { ...this.conditionsMap }
+        console.log(res)
+        res.configs.forEach(config => {
+          this.configs.push(config)
+          // 响应式更新条件映射
+          this.$set(this.conditionsMap, config.tmp_key,
+            conditionData[config.tmp_key] || {}
+          )
+        })
       })
     },
-    setItemRef (el, index) {
-      if (el) {
-        this.questionnaireItemRefs[index] = el // 保存实例
+    customizeEvent (data, callback) {
+      console.log(this.$listeners)
+      if (data.customize.clickEventName && this.$listeners[data.customize.clickEventName]) {
+        // 交由父级处理
+        this.$emit(data.customize.clickEventName, data.customize, callback)
+      } else {
+        this.defaultAction(data.customize.clickEventName, data.customize, callback)
       }
     },
-    init (conditions) {
-      this.getData(this.queryParamsName, conditions)
+    defaultAction (clickEventName, item, callback) {
+      setTimeout(() => {
+        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
+        callback()
+      }, 200)
     },
-    refreshList (index, condition) {
-      if (index < this.conditions.length) {
-        this.conditions[index] = condition
+    setItemRef (el, config) {
+      if (el) {
+        this.questionnaireItemRefs.set(config.tmp_key, el)
+      } else {
+        this.questionnaireItemRefs.delete(config.tmp_key) // 组件卸载时清理
       }
-    }
+    },
+    async init (conditionData) { // 接收完整条件对象
+      await this.getData(this.queryParamsName, conditionData)
+    },
+    // init (configId, conditions) {
+    //   this.getData(this.queryParamsName, conditions)
+    //   // 初始化或更新时
+    //   this.conditionsMap = {
+    //     ...this.conditionsMap,
+    //     [configId]: conditions // 响应式更新
+    //   }
+    // },
+    refreshList (tmpKey, condition) {
+      // 更新条件映射
+      this.$set(this.conditionsMap, tmpKey, condition)
+      // 调用子组件刷新
+      this.questionnaireItemRefs.get(tmpKey)?.refreshList(condition)
+    },
   },
 }
 </script>

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

@@ -13,7 +13,19 @@ export default {
   methods: {
     init () {
       console.log(this)
-      this.$refs.questionnaireRef.init([{ id: 10 }, { id: 20 }, { id: 10 }])
+      const conditionData = {
+        tmp_1: { tmp_id: 1 },
+        tmp_2: { tmp_id: 2 },
+        tmp_3: { tmp_id: 3 }
+      }
+      this.$refs.questionnaireRef.init(conditionData)
+    },
+    save () {
+      console.log(this)
+      console.log(this.$refs.questionnaireRef.questionnaireItemRefs.get('tmp_1').results)
+    },
+    refreshList () {
+      this.$refs.questionnaireRef.refreshList('tmp_2', { tmp_id: 3 })
     }
   }
 }
@@ -26,9 +38,14 @@ export default {
     <a-button type="primary" @click="init">
       初始化
     </a-button>
+    <a-button type="primary" @click="save">
+      保存
+    </a-button>
+    <a-button type="primary" @click="refreshList">
+      刷新
+    </a-button>
   </div>
 </template>
 
 <style scoped>
-
 </style>

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

@@ -19,23 +19,23 @@
           class="row-item"
           :style="{ justifyContent: getFlexJustify(item.style) }"
         >
-          <template v-for="(column, idx) in item.item">
+          <template v-for="(column, idx) in item.columns">
             <template v-if="column.type === 'selectionBox'">
-              <a-checkbox @change="handleChange($event,column,index)" v-model="column.value" :key="`row-${index}-item-${idx}`" :class="['column-item']"></a-checkbox>
+              <a-checkbox @change="handleChange($event,column)" v-model="column.value" :key="`row-${index}-item-${idx}`" :class="['column-item']"></a-checkbox>
             </template>
             <template v-else-if="column.type === 'input'">
-              <a-input @change="handleChange($event,column,index)" :key="`row-${index}-item-${idx}`" :class="['column-item','item-input']" v-model="column.value" />
+              <a-input @change="handleChange($event,column)" :key="`row-${index}-item-${idx}`" :class="['column-item','item-input']" v-model="column.value" />
             </template>
             <template v-else-if="column.type === 'radio'">
               <x-radio
                 :class="['column-item']"
                 :key="`row-${index}-item-${idx}`"
                 :queryParamsName="column.configName"
-                @change="handleChange($event,column,index)">
+                @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,index)" :queryParamsName="column.configName">
+              <x-time-select :key="`row-${index}-item-${idx}`" :class="['column-item']" @change="handleChange($event,column)" :queryParamsName="column.configName">
               </x-time-select>
             </template>
             <template v-else-if="column.type === 'text'">
@@ -51,13 +51,13 @@
               <a-button
                 :class="['column-item']"
                 :key="`row-${index}-item-${idx}`"
-                :disabled="column.disabled"
-                :icon="column.icon"
-                :loading="column.loading"
-                :type="column.buttonType || 'default'"
+                :disabled="column.customize.disabled"
+                :icon="column.customize.icon"
+                :loading="column.customize.loading"
+                :type="column.customize.buttonType || 'default'"
                 @click="handleButtonClick(column)"
               >
-                {{ column.label }}
+                {{ column.value }}
               </a-button>
             </template>
             <template v-else>
@@ -99,8 +99,8 @@ export default {
         split: true,
         header: null
       },
-      results: [],
-      mapping: [] // 行索引  results数据所在的行
+      results: {},
+      oldFixedQueryForm: null
     }
   },
   created () {
@@ -116,38 +116,33 @@ export default {
           ...config
         }
         runLogic(config.data, param, 'af-his').then(res => {
+          console.log('1', res)
           that.data = res || []
           // 将又返回值的数据创建到results
           for (let i = 0; i < res.length; i++) {
             const fields = res[i]
-            if (!fields.item) {
+            if (!fields.columns) {
               continue
             }
-            const value = {}
-            let hasValidData = false // 标识是否有有效数据
-            for (let j = 0; j < fields.item.length; j++) {
-              const field = fields.item[j]
+            console.log('2', fields)
+            for (let j = 0; j < fields.columns.length; j++) {
+              const field = fields.columns[j]
+              console.log('3', field)
+              if (this.results[field.config_id]) {
+                console.error(`Config_id 冲突: ${field.config_id} 重复,同一个模板中不能有形同的配置项`)
+                return
+              }
               if (field.type === 'selectionBox' || field.type === 'input' || field.type === 'radio' || field.type === 'time') {
-                value[field.key] = field.value
-                hasValidData = true
+                this.results[field.config_id] = { value: field.value, data_id: field.data_id }
               }
-            }
-            if (hasValidData) {
-              this.mapping.push(this.results.length)
-              value.row_key = fields.key
-              this.results.push(value)
-            } else {
-              this.mapping.push(undefined)
+              console.log(this.results)
             }
           }
         })
     },
     refreshList (param) {
-      // 清空当前数据和映射关系
       this.data = []
-      this.results = []
-      this.mapping = []
-      this.results = []
+      this.results = {}
       this.getData(this.queryParamsName, param)
     },
     // 行数据排量方式
@@ -159,34 +154,21 @@ export default {
       return validStyles.includes(style) ? style : 'flex-start'
     },
     // 数据发生改变--将修改后的值填充到results
-    handleChange (e, column, rowIndex) {
-      const resultIndex = this.mapping[rowIndex]
-      if (resultIndex === undefined) return
+    handleChange (e, column) {
       if (column.type === 'selectionBox') {
-        this.results[resultIndex][column.key] = e.target.checked
+        this.results[column.config_id].value = e.target.checked
       } else if (column.type === 'input') {
-        this.results[resultIndex][column.key] = column.value
+        this.results[column.config_id].value = column.value
       } else if (column.type === 'radio' || column.type === 'time') {
-        this.results[resultIndex][column.key] = e
+        this.results[column.config_id].value = e
       }
     },
     handleButtonClick (item) {
-      item.loading = true
+      item.customize.loading = true
       const callback = () => {
-        item.loading = false
+        item.customize.loading = false
       }
-      if (item.clickEventName && this.$listeners[item.clickEventName]) {
-        // 交由父级处理
-        this.$emit(item.clickEventName, item, callback)
-      } else {
-        this.defaultAction(item.clickEventName, item, callback)
-      }
-    },
-    defaultAction (clickEventName, item, callback) {
-      setTimeout(() => {
-        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
-        callback()
-      }, 200)
+      this.$emit('customizeEvent', item.customize, callback)
     }
   },
   watch: {

package/src/base-client/components/layout/XPageView/RenderRow.vue

@@ -1,88 +1,88 @@
-<template>
-  <a-row
-    type="flex"
-    :gutter="row.gutter || 0"
-    :align="row.align || 'top'"
-    :justify="row.justify || 'start'"
-  >
-    <a-col
-      v-for="col in getColumns"
-      :key="`page-col-${col.id}`"
-      :span="col.span || 24"
-      :xs="col.xs"
-      :sm="col.sm"
-      :md="col.md"
-      :lg="col.lg"
-      :xl="col.xl"
-      :xxl="col.xxl"
-    >
-      <!-- 行类型，递归渲染子行 -->
-      <template v-if="col.type === 'row'">
-        <x-page-row-template :template="col.template">
-          <render-row
-            v-for="(nestedRow, index) in col.children"
-            :row="nestedRow"
-            :key="`nested-row-${col.id}-${index}`"
-          />
-        </x-page-row-template>
-      </template>
-
-      <!-- 组件类型，渲染动态组件 -->
-      <template v-else>
-        <x-page-row-template :template="col.template">
-          <component
-            :ref="(el) => registerComponentRef(col.id, el)"
-            :is="resolveComponentType(col.type)"
-            v-bind="col.props"
-          >
-            <!-- 如果组件有子组件，递归渲染子行 -->
-            <template v-if="col.children && col.children.length">
-              <!-- 处理纯文本节点 -->
-              <template v-for="(nestedItem, index) in col.children">
-                <template v-if="nestedItem.text">{{ nestedItem.text }}</template>
-                <render-row
-                  v-else
-                  :row="nestedItem"
-                  :key="`comp-child-${col.id}-${index}`"
-                />
-              </template>
-            </template>
-          </component>
-        </x-page-row-template>
-      </template>
-    </a-col>
-  </a-row>
-</template>
-
-<script setup>
-import { defineProps, inject, computed } from 'vue'
-import XPageRowTemplate from './XPageRowTemplate.vue'
-
-import { resolveComponentType } from './componentTypes'
-
-// 注入注册组件方法
-const registerComponent = inject('registerComponent')
-
-// 定义属性
-const props = defineProps({
-  row: {
-    type: Object,
-    required: true
-  }
-})
-
-// 获取列数组
-const getColumns = computed(() => {
-  return props.row.type === 'row' ? props.row.children : [props.row]
-})
-
-// 注册组件引用
-const registerComponentRef = (id, el) => {
-  if (el) {
-    registerComponent(id, el)
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <a-row
+    type="flex"
+    :gutter="row.gutter || 0"
+    :align="row.align || 'top'"
+    :justify="row.justify || 'start'"
+  >
+    <a-col
+      v-for="col in getColumns"
+      :key="`page-col-${col.id}`"
+      :span="col.span || 24"
+      :xs="col.xs"
+      :sm="col.sm"
+      :md="col.md"
+      :lg="col.lg"
+      :xl="col.xl"
+      :xxl="col.xxl"
+    >
+      <!-- 行类型，递归渲染子行 -->
+      <template v-if="col.type === 'row'">
+        <x-page-row-template :template="col.template">
+          <render-row
+            v-for="(nestedRow, index) in col.children"
+            :row="nestedRow"
+            :key="`nested-row-${col.id}-${index}`"
+          />
+        </x-page-row-template>
+      </template>
+
+      <!-- 组件类型，渲染动态组件 -->
+      <template v-else>
+        <x-page-row-template :template="col.template">
+          <component
+            :ref="(el) => registerComponentRef(col.id, el)"
+            :is="resolveComponentType(col.type)"
+            v-bind="col.props"
+          >
+            <!-- 如果组件有子组件，递归渲染子行 -->
+            <template v-if="col.children && col.children.length">
+              <!-- 处理纯文本节点 -->
+              <template v-for="(nestedItem, index) in col.children">
+                <template v-if="nestedItem.text">{{ nestedItem.text }}</template>
+                <render-row
+                  v-else
+                  :row="nestedItem"
+                  :key="`comp-child-${col.id}-${index}`"
+                />
+              </template>
+            </template>
+          </component>
+        </x-page-row-template>
+      </template>
+    </a-col>
+  </a-row>
+</template>
+
+<script setup>
+import { defineProps, inject, computed } from 'vue'
+import XPageRowTemplate from './XPageRowTemplate.vue'
+
+import { resolveComponentType } from './componentTypes'
+
+// 注入注册组件方法
+const registerComponent = inject('registerComponent')
+
+// 定义属性
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true
+  }
+})
+
+// 获取列数组
+const getColumns = computed(() => {
+  return props.row.type === 'row' ? props.row.children : [props.row]
+})
+
+// 注册组件引用
+const registerComponentRef = (id, el) => {
+  if (el) {
+    registerComponent(id, el)
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>