vue2-client 1.14.99 → 1.15.2

package/package.json

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

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

@@ -112,6 +112,7 @@ export default {
           this.config.data[newKey],
           oldRef ? oldRef[0] : undefined,
         ]
+        args.push(newTabName)
         if (!newRef) {
           args.push(null)
           console.warn('新页签示例切换页签时暂未初始化，仅调用该页签初始化方法不调用切换函数')

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

@@ -32,8 +32,8 @@ export default {
   },
   methods: {
     // 获取配置
-    async getData (conditionData) {
-      getConfigByName(this.queryParamsName, 'af-his', res => {
+    async getData (queryParamsName, conditionData) {
+      getConfigByName(queryParamsName, 'af-his', res => {
         // 清空旧数据
         this.configs = []
         this.conditionsMap = { ...this.conditionsMap }
@@ -70,15 +70,17 @@ export default {
         this.questionnaireItemRefs.delete(config.tmp_key) // 组件卸载时清理
       }
     },
-    async init () { // 接收完整条件对象
-      this.$emit('init')
+    async init (conditionData) { // 接收完整条件对象
+      // this.$emit('init')
+      console.log('conditionData===>', conditionData)
+      await this.getData(this.queryParamsName, conditionData)
     },
 
     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/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>