xiaochan 1 year ago
parent
commit
b2bac0c18d

+ 1 - 1
src/api/reports/report-query-center.ts

@@ -37,7 +37,7 @@ export interface PageJsonObject {
         labelWidth?: string | number,
         inline: boolean
     },
-    defaultValue: any
+    paramsDefaultValue: any
 }
 
 export interface ReportForms {

+ 2 - 2
src/views/data-base/page-editor-help-v2/components/page-editor-v2/PageHelpOtherConfigurations.vue

@@ -66,14 +66,14 @@ function defaultValue() {
   defaultDialog.value = true
   const temp = {};
   props.store.pageData.value.header.forEach(item => {
-    temp[item.key] = props.store.pageData.value.params[item.key]
+    temp[item.key] = props.store.pageData.value.params[item.key] ?? ""
   })
   divRef.value.json = temp
 }
 
 function closed(val) {
   defaultDialog.value = false
-  props.store.pageData.value.defaultValue = val
+  props.store.pageData.value.paramsDefaultValue = val
   props.store.pageData.value.params = val
 }
 

+ 7 - 2
src/views/data-base/page-editor-help-v2/components/page-editor-v2/PageHelpV2.vue

@@ -184,9 +184,14 @@ const loading = ref(false)
 function requiredInit(setDefaultValue = false) {
   formRef.value!.resetFields()
   rules.value = []
+  const isEmpty = typeof pageData.value.paramsDefaultValue !== 'undefined' && !XEUtils.isEmpty(pageData.value.paramsDefaultValue)
   pageData.value.header.forEach(item => {
     if (setDefaultValue) {
-      pageData.value.params = XEUtils.clone(pageData.value.defaultValue, true)
+      if (isEmpty) {
+        pageData.value.params = XEUtils.clone(pageData.value.paramsDefaultValue, true)
+      } else {
+        pageData.value.params[item.key] = item.defaultValue
+      }
     }
     if (item.required) {
       rules.value[item.key] = [{required: true, message: '必填', trigger: 'blur'}]
@@ -306,7 +311,7 @@ function setTableData(res) {
             const tempData = {
               ...pageData.params,
               details: true,
-              row: row.rowData
+              row: row
             }
             apiFunc(pageData.submitUrl, tempData)
                 .then(res => {

+ 1 - 1
src/views/data-base/page-editor-help-v2/page-help-v2.ts

@@ -68,7 +68,7 @@ export function usePageStore(props) {
             inline: true,
             labelWidth: '120px'
         },
-        defaultValue: {}
+        paramsDefaultValue: {}
     })
 
     const tableBind = ref({