vue2-client 1.14.97 → 1.15.1

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

@@ -47,13 +47,14 @@ export default {
         })
       })
     },
-    customizeEvent (data, callback) {
+    customizeEvent (customize, callback) {
       console.log(this.$listeners)
-      if (data.customize.clickEventName && this.$listeners[data.customize.clickEventName]) {
+      console.log(customize)
+      if (customize.clickEventName && this.$listeners[customize.clickEventName]) {
         // 交由父级处理
-        this.$emit(data.customize.clickEventName, data.customize, callback)
+        this.$emit(customize.clickEventName, customize, callback)
       } else {
-        this.defaultAction(data.customize.clickEventName, data.customize, callback)
+        this.defaultAction(customize.clickEventName, customize, callback)
       }
     },
     defaultAction (clickEventName, item, callback) {
@@ -70,21 +71,16 @@ export default {
       }
     },
     async init (conditionData) { // 接收完整条件对象
+      // this.$emit('init')
+      console.log('conditionData===>', 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)
+      // // 调用子组件刷新
+      // this.questionnaireItemRefs.get(tmpKey)?.refreshList(condition)
     },
   },
 }

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

@@ -111,38 +111,34 @@ export default {
     // 获取配置
     async getData (config, param) {
       const that = this
-        that.config = {
-          ...that.config,
-          ...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.columns) {
-              continue
+      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++) {
+          const fields = res[i]
+          if (!fields.columns) {
+            continue
+          }
+          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
             }
-            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') {
-                this.results[field.config_id] = { value: field.value, data_id: field.data_id }
-              }
-              console.log(this.results)
+            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 }
             }
+            console.log(this.results)
           }
-        })
+        }
+      })
     },
     refreshList (param) {
-      this.data = []
-      this.results = {}
       this.getData(this.queryParamsName, param)
     },
     // 行数据排量方式
@@ -190,26 +186,6 @@ export default {
 .list-container {
   width: 100%;
 }
-
-/** 自定义滚动条样式
-    .list-wrapper {
-      max-height: 240px;
-      overflow-y: auto;
-      padding-right: 2px;
-    }
-    .list-wrapper::-webkit-scrollbar {
-      width: 6px;
-    }
-
-    .list-wrapper::-webkit-scrollbar-thumb {
-      background-color: #d9d9d9;
-      border-radius: 3px;
-    }
-
-    .list-wrapper::-webkit-scrollbar-track {
-      background-color: #f0f0f0;
-    }
-*/
 /* header样式 */
 .list-wrapper ::v-deep .ant-list-header {
   background-color: #F4F4F4; /* 自定义背景色 */

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>