4.1.49 修改CurdWindowResource/uniqueByNoWithRole和CurdWindowResource/uniqueByNoWithRoleNew

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.1.48",
+  "version": "4.1.49",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",

src/window/tabFormView/TabFormView.vue

@@ -1109,8 +1109,12 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (window) {
+            if(window.errorCode != 0){
+              Notify.error('Error', window.errorMessage, false);
+              return;
+            }
             _self.loading = false;
-            initWindowAfterLoaded(window);
+            initWindowAfterLoaded(window.data);
             _self.uniqueByNoAccessControl();
           },
           function () {
@@ -1175,14 +1179,18 @@ export default {
         _self.windowNo,
         function (window) {
           _self.loading = false;
-          WindowClientUtil.parseFilterSchema(window);
-          var tab = WindowClientUtil.getTab(window, _self.tabIndex);
-          WindowClientUtil.parseSubTab(window, tab);
+          if(window.errorCode != 0){
+            Notify.error('Error', window.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(window.data);
+          var tab = WindowClientUtil.getTab(window.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(window.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window.data);
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.window = window;
-          _self.jsUrl = window.jsUrl;
+          _self.window = window.data;
+          _self.jsUrl = window.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,

src/window/tabGridView/TabGridEdit.vue

@@ -670,8 +670,12 @@ export default {
       var _self = this;
       if (_self.windowNo) {
         WindowServerUtil.getWindowById(_self.windowNo, function (data) {
-          WindowClientUtil.parseFilterSchema(data);
-          _self.initWindow(data);
+          if(data.errorCode != 0){
+            Notify.error('Error', data.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(data.data);
+          _self.initWindow(data.data);
         });
       }
     },

src/window1/tabFormEdit/TabFormEdit.vue

@@ -741,15 +741,20 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (window) {
-          WindowClientUtil.parseFilterSchema(window);
-          var tab = WindowClientUtil.getTab(window, _self.tabIndex);
-          WindowClientUtil.parseSubTab(window, tab);
+          _self.loading = false;
+          if(window.errorCode != 0){
+            Notify.error('Error', window.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(window.data);
+          var tab = WindowClientUtil.getTab(window.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(window.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window.data);
 
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.window = window;
-          _self.jsUrl = window.jsUrl;
+          _self.window = window.data;
+          _self.jsUrl = window.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,
@@ -819,7 +824,11 @@ export default {
           _self.windowNo,
           function (window) {
             _self.loading = false;
-            initWindowAfterLoaded(window);
+            if(window.errorCode != 0){
+              Notify.error('Error', window.errorMessage, false);
+              return;
+            }
+            initWindowAfterLoaded(window.data);
           },
           function () {
             _self.loading = false;
@@ -904,15 +913,19 @@ export default {
         _self.windowNo,
         function (window) {
           _self.loading = false;
-          WindowClientUtil.parseFilterSchema(window);
-          var tab = WindowClientUtil.getTab(window, _self.tabIndex);
-          WindowClientUtil.parseSubTab(window, tab);
+          if(window.errorCode != 0){
+            Notify.error('Error', window.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(window.data);
+          var tab = WindowClientUtil.getTab(window.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(window.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window.data);
 
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.window = window;
-          _self.jsUrl = window.jsUrl;
+          _self.window = window.data;
+          _self.jsUrl = window.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,

src/window1/tabFormEdit/TabFormEditModal.vue

@@ -846,16 +846,21 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (curdWindow) {
-          WindowClientUtil.parseFilterSchema(curdWindow);
-          var tab = WindowClientUtil.getTab(curdWindow, _self.tabIndex);
-          WindowClientUtil.parseSubTab(curdWindow, tab);
-          WindowClientUtil.parseOneToOneTab(curdWindow, tab);
+          _self.loading = false;
+          if(curdWindow.errorCode != 0){
+            Notify.error('Error', curdWindow.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(curdWindow.data);
+          var tab = WindowClientUtil.getTab(curdWindow.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(curdWindow.data, tab);
+          WindowClientUtil.parseOneToOneTab(curdWindow.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(curdWindow);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(curdWindow.data);
 
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.curdWindow = curdWindow;
-          _self.jsUrl = curdWindow.jsUrl;
+          _self.curdWindow = curdWindow.data;
+          _self.jsUrl = curdWindow.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,
@@ -925,7 +930,11 @@ export default {
           _self.windowNo,
           function (curdWindow) {
             _self.loading = false;
-            initWindowAfterLoaded(curdWindow);
+            if(curdWindow.errorCode != 0){
+              Notify.error('Error', curdWindow.errorMessage, false);
+              return;
+            }
+            initWindowAfterLoaded(curdWindow.data);
           },
           function () {
             _self.loading = false;
@@ -1011,16 +1020,20 @@ export default {
         _self.windowNo,
         function (curdWindow) {
           _self.loading = false;
-          WindowClientUtil.parseFilterSchema(curdWindow);
-          var tab = WindowClientUtil.getTab(curdWindow, _self.tabIndex);
-          WindowClientUtil.parseSubTab(curdWindow, tab);
-          WindowClientUtil.parseOneToOneTab(curdWindow, tab);
+          if(curdWindow.errorCode != 0){
+            Notify.error('Error', curdWindow.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(curdWindow.data);
+          var tab = WindowClientUtil.getTab(curdWindow.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(curdWindow.data, tab);
+          WindowClientUtil.parseOneToOneTab(curdWindow.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(curdWindow);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(curdWindow.data);
 
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.curdWindow = curdWindow;
-          _self.jsUrl = curdWindow.jsUrl;
+          _self.curdWindow = curdWindow.data;
+          _self.jsUrl = curdWindow.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,

src/window1/tabFormView/TabFormView.vue

@@ -1110,7 +1110,11 @@ export default {
           _self.windowNo,
           function (window) {
             _self.loading = false;
-            initWindowAfterLoaded(window);
+            if(window.errorCode != 0){
+              Notify.error('Error', window.errorMessage, false);
+              return;
+            }
+            initWindowAfterLoaded(window.data);
             _self.uniqueByNoAccessControl();
           },
           function () {
@@ -1129,6 +1133,7 @@ export default {
         _self.window = window;
         _self.jsUrl = window.jsUrl;
         _self.tab = tab;
+        console.log(_self.window,'========================');
         TabFormView.restoreTabFormFieldDef(
           _self.windowNo,
           _self.tabIndex,
@@ -1175,14 +1180,18 @@ export default {
         _self.windowNo,
         function (window) {
           _self.loading = false;
-          WindowClientUtil.parseFilterSchema(window);
-          var tab = WindowClientUtil.getTab(window, _self.tabIndex);
-          WindowClientUtil.parseSubTab(window, tab);
+          if(window.errorCode != 0){
+            Notify.error('Error', window.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(window.data);
+          var tab = WindowClientUtil.getTab(window.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(window.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(window.data);
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.window = window;
-          _self.jsUrl = window.jsUrl;
+          _self.window = window.data;
+          _self.jsUrl = window.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,

src/window1/tabFormView/TabFormViewModal.vue

@@ -1174,7 +1174,11 @@ export default {
           _self.windowNo,
           function (curdWindow) {
             _self.loading = false;
-            initWindowAfterLoaded(curdWindow);
+            if(curdWindow.errorCode != 0){
+              Notify.error('Error', curdWindow.errorMessage, false);
+              return;
+            }
+            initWindowAfterLoaded(curdWindow.data);
             _self.uniqueByNoAccessControl();
           },
           function () {
@@ -1239,15 +1243,20 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (curdWindow) {
-          WindowClientUtil.parseFilterSchema(curdWindow);
-          var tab = WindowClientUtil.getTab(curdWindow, _self.tabIndex);
-          WindowClientUtil.parseSubTab(curdWindow, tab);
-          WindowClientUtil.parseOneToOneTab(curdWindow, tab);
+          _self.loading = false;
+          if(curdWindow.errorCode != 0){
+            Notify.error('Error', curdWindow.errorMessage, false);
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(curdWindow.data);
+          var tab = WindowClientUtil.getTab(curdWindow.data, _self.tabIndex);
+          WindowClientUtil.parseSubTab(curdWindow.data, tab);
+          WindowClientUtil.parseOneToOneTab(curdWindow.data, tab);
           WindowClientUtil.parseFieldGroup(tab);
-          WindowClientUtil.restoreWindowTabFieldGroupsVisible(curdWindow);
+          WindowClientUtil.restoreWindowTabFieldGroupsVisible(curdWindow.data);
           _self.tabFormFields = WindowClientUtil.getDetailField(tab);
-          _self.curdWindow = curdWindow;
-          _self.jsUrl = curdWindow.jsUrl;
+          _self.curdWindow = curdWindow.data;
+          _self.jsUrl = curdWindow.data.jsUrl;
           _self.tab = tab;
           TabFormView.restoreTabFormFieldDef(
             _self.windowNo,

src/window1/tabGridView/TabGridEdit.vue

@@ -646,8 +646,16 @@ export default {
       var _self = this;
       if (_self.windowNo) {
         WindowServerUtil.uniqueByNoWithRoleNew(_self.windowNo, function (data) {
-          WindowClientUtil.parseFilterSchema(data);
-          _self.initWindow(data);
+          if (data.errorCode != 0) {
+            Notify.error(
+              _self.$t('lang.tabGridEdit.describe1'),
+              data.errorMessage,
+              false,
+            );
+            return;
+          }
+          WindowClientUtil.parseFilterSchema(data.data);
+          _self.initWindow(data.data);
         });
       }
     },

src/workflow/CreateWorkflow.vue

@@ -101,8 +101,12 @@ export default {
       WindowServerUtil.getWindowById(
         windowId,
         function (data) {
-          var tab = data.tabs[0];
           _self.loading=false;
+          if(data.errorCode != 0){
+            Notify.error('Error', data.errorMessage, false);
+            return;
+          }
+          var tab = data.data.tabs[0];
           window.open(
             Common.getRedirectUrl(
               '#/desktop/window/window-edit/create/' +

src/workflow/ReportApprove.vue

@@ -354,7 +354,11 @@ export default {
           _self.windowNo,
           function (window) {
             _self.loading = false;
-            initWindowAfterLoaded(window);
+            if(window.errorCode != 0){
+              Notify.error('Error', window.errorMessage, false);
+              return;
+            }
+            initWindowAfterLoaded(window.data);
           },
           function () {
             _self.loading = false;