vue2-client 1.14.80 → 1.14.81

package/package.json

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

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -659,24 +659,7 @@ export default {
           continue
         }
       }
-    },
-    closeAddReport () {
-      // 获取所有 xAddReport 组件实例
-      const addReportRefs = this.$parent.$refs.xAddReport
-      if (addReportRefs) {
-        // 如果是数组，遍历关闭所有实例
-        if (Array.isArray(addReportRefs)) {
-          addReportRefs.forEach(ref => {
-            if (ref && typeof ref.close === 'function') {
-              ref.close()
-            }
-          })
-        } else if (typeof addReportRefs.close === 'function') {
-          // 如果是单个实例，直接关闭
-          addReportRefs.close()
-        }
-      }
-    },
+    }
   },
   beforeMount () {
     if (this.useOssForImg) {

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

@@ -1,7 +1,8 @@
 {
 	"config":{
 	  "title":"",
-	  "split":""
+	  "split":"",
+	  "style":""//TODO 居中方式
 	},
  	"content": [
 		{
@@ -12,15 +13,19 @@
 					"type":"",
 					"key": "",
 					"value": {},
-					"configName":"" // 通过后端获配置单选多选
+
+					"configName":"", // 通过后端获配置单选多选
+					"button-type":"",
+
+
 				}
 			]
 		}
 	]
 }
 //常量取值 checkBox多选
-type [radio,selectionBox,text,input,time,describe]
-justifyContent = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
+type [radio,selectionBox,text,input,time,describe,button]
+style = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
 
 "results": [{
    "row_key": "",

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

@@ -11,6 +11,7 @@
         <div >{{ config.header }}</div>
       </template>
       <a-list-item
+        :class="{'header-row': item.type === 'header'}"
         slot="renderItem"
         slot-scope="item, index">
         <div
@@ -42,6 +43,22 @@
             <template v-else-if="column.type === 'describe'">
               <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-describe']"> {{ column.value }} </span>
             </template>
+            <template v-else-if="column.type === 'header'">
+              <span :key="`row-${index}-item-${idx}`" :class="['item-header']"> {{ column.value }} </span>
+            </template>
+            <template v-else-if="column.type === 'button'">
+              <a-button
+                :class="['column-item']"
+                :key="`row-${index}-item-${idx}`"
+                :disabled="column.disabled"
+                :icon="column.icon"
+                :loading="column.loading"
+                :type="column.buttonType || 'default'"
+                @click="handleButtonClick(column)"
+              >
+                {{ column.label }}
+              </a-button>
+            </template>
             <template v-else>
               <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-text']"> {{ column.value }} </span>
             </template>
@@ -146,6 +163,24 @@ export default {
       } else if (column.type === 'radio' || column.type === 'time') {
         this.results[resultIndex][column.key] = e
       }
+    },
+    handleButtonClick (item) {
+      item.loading = true
+      const callback = () => {
+        item.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)
     }
   },
   watch: {
@@ -196,6 +231,7 @@ export default {
   display: flex;
   justify-content: center;
 }
+
 .list-wrapper ::v-deep .x-radio-item {
   margin-bottom: 0;
 }
@@ -208,8 +244,13 @@ export default {
 .list-wrapper ::v-deep .x-time-select {
   width: auto !important;
 }
+.list-wrapper ::v-deep .header-row {
+  background-color: #F4F4F4; /* 自定义背景色 */
+  height: 45px !important;
+}
 /*每一行的整体样式*/
 .row-item{
+  width: 100%;
   display: flex;
   align-items: center;
   padding: 2px;
@@ -225,7 +266,10 @@ export default {
   color: #808080 ;
 }
 .item-input{
-  flex: 1;
+  width: auto !important;
+}
+.item-header {
+  color: rgba(0, 0, 0, 0.65)
 }
 
 </style>