Ver código fonte

[*]优化导出时刷新数据,requestBody属性面板去掉vo

Lianjy 4 anos atrás
pai
commit
93b7938f87

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java

@@ -144,7 +144,7 @@ public class RequestHandler extends MagicController {
 		if (!parameter.isRequired() && parameters.isEmpty()) {
 			return true;
 		}
-		if (parameter.isRequired() && !BooleanLiteral.isTrue(parameters.getOrDefault(parameter.getName(), ""))) {
+		if (parameter.isRequired() && !BooleanLiteral.isTrue(parameters.get(parameter.getName()))) {
 			throw new ValidateException(jsonCode, StringUtils.defaultIfBlank(parameter.getError(), String.format("%s[%s]为必填项", comment, parameter.getName())));
 		}
 		Object value = parameters.get(parameter.getName());

+ 3 - 3
magic-editor/src/console/src/components/common/magic-json.vue

@@ -65,9 +65,9 @@
 
       </div>
       <div class="panel-box f_c" v-else>
-        <div class="box-item">
-          <div class="item-title">对象VO</div>
-          <div class="item-content"><magic-input :value.sync="fieldObj.name" style="width: 100%" :placeholder="'请输入对象VO名称'"/></div>
+        <div class="box-item" v-if="fieldObj.name">
+          <div class="item-title">Key</div>
+          <div class="item-content">{{fieldObj.name}}</div>
         </div>
         <div class="box-item">
           <div class="item-title">对象注释</div>

+ 1 - 1
magic-editor/src/console/src/components/layout/magic-header.vue

@@ -63,7 +63,7 @@
     </magic-dialog>
     <magic-dialog v-if="exportVisible" v-model="exportVisible" title="导出"  align="right" :moveable="false" width="340px" height="490px" className="ma-tree-wrapper">
       <template #content>
-        <magic-resource-choose ref="resourceExport" height="400px" max-height="400px"/>
+        <magic-resource-choose ref="resourceExport" :refreshData="exportVisible" height="400px" max-height="400px"/>
       </template>
       <template #buttons>
         <button class="ma-button" @click="$refs.resourceExport.doSelectAll(true)">全选</button>

+ 8 - 7
magic-editor/src/console/src/components/resources/magic-resource-choose.vue

@@ -49,7 +49,8 @@ export default {
     maxHeight: {
       type: String,
       required: true
-    }
+    },
+    refreshData: Boolean
   },
   components: {
     MagicCheckbox,
@@ -77,6 +78,12 @@ export default {
   },
   created() {
   },
+  watch: {
+    refreshData: {
+      immediate: true,
+      handler: "initData"
+    }
+  },
   methods: {
     // 初始化数据
     initData() {
@@ -331,12 +338,6 @@ export default {
       handle(this.tree)
       return result
     }
-  },
-  mounted() {
-    console.log('mounted')
-    bus.$on('login',() => {
-      this.initData();
-    })
   }
 }
 </script>