Explorar o código

InfoWindowResource/uniqueByNo 修改返回值。

YangZhiJie hai 1 ano
pai
achega
c7d2bca237

+ 13 - 7
packages/info/src/DocGenerator.vue

@@ -46,6 +46,7 @@
 </template>
 <script>
 import Common from '../../common/Common.js';
+import Notify from '../../common/Notify.js';
 import InfoUtil from './InfoUtil.js';
 import Loading from '../../loading/src/Loading.vue';
 import QueryCondition from './QueryCondition.vue';
@@ -131,13 +132,18 @@ export default {
         beforeSend: function (request) {
           Common.addTokenToRequest(request);
         },
-        success: function (data) {
-          _self.loading = true;
-          _self.infoWindowDto = data;
-          _self.$emit('showTitle', data.name);
-          _self.$nextTick(function () {
-            _self.initQueryPage();
-          });
+        success: function (response) {
+          if(response.errorCode == 0){
+            const data = response.data;
+            _self.loading = true;
+            _self.infoWindowDto = data;
+            _self.$emit('showTitle', data.name);
+            _self.$nextTick(function () {
+              _self.initQueryPage();
+            });
+          }else{
+            Notify.error('查询窗口定义错误', response.errorMessage, false);
+          }
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           _self.loading = true;

+ 26 - 22
packages/info/src/InfoWindow.vue

@@ -144,33 +144,37 @@ export default defineComponent({
         beforeSend: function (request) {
           Common.addTokenToRequest(request);
         },
-        success: function (data) {
+        success: function (response) {
           _self.loading = false;
-          console.log(data);
-          _self.infoWindowDto = data;
+          
+          if(response.errorCode == 0){
+            _self.infoWindowDto = response.data;
 
-          // 计算显示的部件
-          if (_self.infoWindowDto.componentName != undefined && _self.infoWindowDto.componentName != '') {
-            _self.componentName = _self.infoWindowDto.componentName;
-            _self.dynamicInit();
-          } else if (_self.infoWindowDto.infoWindowType == undefined || _self.infoWindowDto.infoWindowType == 'TableGrid'
-              || _self.infoWindowDto.infoWindowType == 'NONE') {
-            _self.componentName = 'QueryPage';
-          }
+            // 计算显示的部件
+            if (_self.infoWindowDto.componentName != undefined && _self.infoWindowDto.componentName != '') {
+              _self.componentName = _self.infoWindowDto.componentName;
+              _self.dynamicInit();
+            } else if (_self.infoWindowDto.infoWindowType == undefined || _self.infoWindowDto.infoWindowType == 'TableGrid'
+                || _self.infoWindowDto.infoWindowType == 'NONE') {
+              _self.componentName = 'QueryPage';
+            }
 
-          if(_self.componentName === 'QueryPage' || _self.componentName === 'ClientOrganization'){
-            _self.componentLoadedCount ++;
-          }
+            if(_self.componentName === 'QueryPage' || _self.componentName === 'ClientOrganization'){
+              _self.componentLoadedCount ++;
+            }
 
-          _self.$nextTick(function () {
-            if (_self.infoWindowDto.componentName == undefined || _self.infoWindowDto.componentName == '') {
-              if (_self.infoWindowDto.infoWindowType == undefined || _self.infoWindowDto.infoWindowType == 'TableGrid' || _self.infoWindowDto.infoWindowType == 'NONE') {
-                _self.$refs.infoComponent.initWidget(data);
-              } else {
-                _self.$refs.infoComponent.initWidget(data);
+            _self.$nextTick(function () {
+              if (_self.infoWindowDto.componentName == undefined || _self.infoWindowDto.componentName == '') {
+                if (_self.infoWindowDto.infoWindowType == undefined || _self.infoWindowDto.infoWindowType == 'TableGrid' || _self.infoWindowDto.infoWindowType == 'NONE') {
+                  _self.$refs.infoComponent.initWidget(data);
+                } else {
+                  _self.$refs.infoComponent.initWidget(data);
+                }
               }
-            }
-          });
+            });
+          }else{
+            Notify.error('查询窗口定义错误', response.errorMessage, false);
+          }
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           _self.loading = false;

+ 7 - 3
packages/info/src/SearchAutoCompleteWidget.vue

@@ -187,9 +187,13 @@ export default {
         beforeSend: function (request) {
           Common.addTokenToRequest(request);
         },
-        success: function (data) {
-          _self.infoWindowDto = data;
-          resolve();
+        success: function (response) {
+          if(response.errorCode == 0){
+            _self.infoWindowDto = response.data;
+            resolve();
+          }else{
+            reject(response.errorMessage);
+          }
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           Common.processException(XMLHttpRequest, textStatus, errorThrown);