vue2-client 1.15.3 → 1.15.5

package/package.json

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

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

@@ -200,10 +200,19 @@ export default {
         return { id: null, name: 'Guest' }
       },
     },
-    // 父组件API（通用）,对象参数，可给里面任意塞父组件的方法
-    parentAPI: {
+
+    /**
+     * 祖先组件注入的自定义函数对象
+     * 此对象包含祖先组件通过provide/inject机制注入的各种自定义函数
+     * 子组件可以通过this.generalFunction来访问这些函数
+     * 使用示例：
+     * - this.generalFunction.handleCustomEvent(data)
+     * - this.generalFunction.submitForm(formData)
+     * - this.generalFunction.validateData(data)
+     */
+    generalFunction: {
       default: () => {
-        console.warn('getParentsThis is not provided.')
+        console.warn('generalFunction is not provided.')
         return null
       }
     }
@@ -380,6 +389,18 @@ export default {
       default: () => {
         return {}
       }
+    },
+    /**
+     * 额外数据对象
+     * 类型：Object
+     * 默认值：返回一个空对象
+     * 用途：用于传递组件需要的额外数据参数
+     */
+    extraData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   watch: {

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

@@ -26,6 +26,7 @@
           :config-name="tab.slotConfig"
           :env="env"
           v-bind="compProp"
+          :extra-data="extraData"
         />
       </a-tab-pane>
     </a-tabs>

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) {

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

@@ -16,6 +16,7 @@
       </div>
       <div v-if="type === 'date'" class="picker-wrapper">
         <a-date-picker
+          :value="dateRange"
           :format="format"
           :disabled="disabled"
           :allowClear="allowClear"
@@ -66,25 +67,32 @@ export default {
   watch: {
     value: {
       handler (newVal) {
-        if (newVal && newVal.length === 2) {
-          this.dateRange = [
-            newVal[0] ? moment(newVal[0]) : null,
-            newVal[1] ? moment(newVal[1]) : null
-          ]
-        } else if (newVal && this.type === 'date' && newVal.length === 1) {
-          this.dateRange = [newVal[0] ? moment(newVal[0]) : null]
-        } else {
-          this.dateRange = []
-        }
+        this.convertValueToMoment(newVal)
       },
       immediate: true,
       deep: true
+    },
+    type () {
+      this.convertValueToMoment(this.value)
     }
+
   },
   created () {
     this.getData(this.queryParamsName)
   },
   methods: {
+    convertValueToMoment (value) {
+      if (this.type === 'range' && value?.length === 2) {
+        this.dateRange = [
+          value[0] ? moment(value[0]) : null,
+          value[1] ? moment(value[1]) : null
+        ]
+      } else if (this.type === 'date' && value?.length === 1) {
+        this.dateRange = [value[0] ? moment(value[0]) : null]
+      } else {
+        this.dateRange = []
+      }
+    },
     handleDateChange (dates, dateStrings) {
       this.dateRange = dates
       console.warn(dateStrings)
@@ -92,12 +100,13 @@ export default {
     },
     async getData (data) {
       getConfigByName(data, 'af-his', res => {
-         if (['date', 'range'].includes(res.type)) {
-           this.type = res.type
-         }
-         if (res.label !== undefined) {
-           this.label = res.label
-         }
+        if (['date', 'range'].includes(res.type)) {
+          this.type = res.type
+        }
+        if (res.label !== undefined) {
+          this.label = res.label
+        }
+        this.convertValueToMoment(this.value)
       })
     }
   }

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -70,7 +70,7 @@ export default {
   },
   provide () {
     return {
-      parentAPI: {
+      generalFunction: {
         setCancel: this.setCancel,
       }
     }