ecinc-cloud-mappaio 9.6.92 → 9.6.94

package/lib/ecmappaio.common.js

@@ -268,9 +268,6 @@ defaultText：默认文本
 */
 function $tx(expression, variables, defaultText) {
   var $scope = this && this.$vnode ? this.$vnode.context : window.$wapp || window.$mapp;
-  if (expression === 'ecwapp.Wflowform.WfTaskNode.designatedDepartment') {
-    debugger;
-  }
   if (!$scope.$i18n) {
     console.log(expression);
     debugger;
@@ -293,9 +290,6 @@ function $tx(expression, variables, defaultText) {
 
 // translate router.meta.title, be used in breadcrumb sidebar tagsview
 function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
-  if (meta.i18nCode === 'keepAttend' || moduleCode === 'submitHandle') {
-    // debugger
-  }
   $scope = $scope || this;
   if ($scope.$i18n && $scope.$i18n.locale === 'zhCN') {
     //中文，按钮，忽略语言包
@@ -303,7 +297,7 @@ function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
       return meta.btnName;
     }
   }
-  if (meta.i18nCode && $scope.$te(meta.i18nCode)) {
+  if (meta.i18nCode && meta.i18nCode.indexOf('.') !== -1 && $scope.$te(meta.i18nCode)) {
     return $scope.$t(meta.i18nCode, variables);
   }
   var moduleInfo = $scope.moduleInfo || $scope.$vnode.context.moduleInfo || $scope.$vnode.context.$vnode.context.moduleInfo;
@@ -40340,6 +40334,7 @@ var wfengine_install = function install(Vue) {
         $scope.canEditBodyfile = canEditBodyfile;
       },
       getWfJsonData: function getWfJsonData($scope, wfInstance, params) {
+        var _this2 = this;
         return new Promise(function (resolve) {
           var wfEngineUrl = params.wfEngineUrl || $scope.wfEngineUrl || 'workflow/wfInstance';
           wfEngineUrl += '/getWfJsonData';
@@ -40416,13 +40411,16 @@ var wfengine_install = function install(Vue) {
               }
               // $scope.submitTemplateList.unshift({ templateName: '---选择办理模板---', valid: true })
               $scope.submitTemplate = $scope.submitTemplateList[0];
+              _this2.$nextTick(function () {
+                $scope.$bus.emit('initSubmitHandle');
+              });
             }
             resolve(res);
           });
         });
       },
       saveWfInstance: function saveWfInstance($scope, submitType, params) {
-        var _this2 = this;
+        var _this3 = this;
         return new Promise(function (resolve) {
           $scope.submitHandle.submitType = submitType;
           delete $scope.submitHandle.selectedNodes;
@@ -40466,7 +40464,7 @@ var wfengine_install = function install(Vue) {
             $scope.submitHandle.busiContent = $scope.vo.flContent;
           }
           var submitHandle = JSON.parse(JSON.stringify($scope.submitHandle));
-          if (submitType.indexOf('Save') !== -1 && submitType !== 'AutoSave') {
+          if (submitType.indexOf('Save') !== -1) {
             js_cookie_default().set('route-index-' + $scope.wfInstance.id, submitHandle.route.index);
             var route = $scope.wfJsonData == null || $scope.wfJsonData.routes == null || $scope.wfJsonData.routes.length === 0 ? {
               taskNodes: []
@@ -40528,7 +40526,7 @@ var wfengine_install = function install(Vue) {
                 delete wfNode.users;
                 submitHandle.nextTNProp.push(wfNode);
                 submitHandle.nextTNUser.push(nextUsers);
-                js_cookie_default().set('route-wfuser-' + $scope.wfInstance.id + '-' + wfNode.id, '', {
+                js_cookie_default().set('route-wfuser-' + $scope.curTN.tnID + '-' + wfNode.id, '', {
                   expires: 0
                 });
               }
@@ -40599,7 +40597,7 @@ var wfengine_install = function install(Vue) {
                 }
                 if (res.body.wfInstance.passenger.commandBar) {
                   var commandBar = JSON.parse(JSON.stringify(res.body.wfInstance.passenger.commandBar));
-                  _this2.setCommandBar($scope, commandBar);
+                  _this3.setCommandBar($scope, commandBar);
                   $scope.commandBar = commandBar;
                 }
                 $scope.vo = $scope.vobak;
@@ -40626,7 +40624,7 @@ var wfengine_install = function install(Vue) {
                 if (typeof $scope.onWflowFormSubmited === 'function') {
                   $scope.onWflowFormSubmited($scope);
                 }
-                _this2.$nextTick(function () {
+                _this3.$nextTick(function () {
                   $scope.$bus.emit('initSubmitHandle');
                 });
               } else {
@@ -40757,7 +40755,7 @@ var wfengine_install = function install(Vue) {
         };
       },
       checkOuterDeputy: function checkOuterDeputy($scope, params) {
-        var _this3 = this;
+        var _this4 = this;
         return new Promise(function (resole) {
           if ($scope.submitHandle.needCheckOuterDeputy && $scope.submitHandle.needCheckOuterDeputy.length > 0) {
             var nextTNUsers = $scope.submitHandle.needCheckOuterDeputy;
@@ -40807,7 +40805,7 @@ var wfengine_install = function install(Vue) {
                       message: '已选择外出代理人。'
                     });
                   } else {
-                    _this3.$bus.emit('selectOuterDeputys', outerDeputys, $scope.submitHandle.route, resole);
+                    _this4.$bus.emit('selectOuterDeputys', outerDeputys, $scope.submitHandle.route, resole);
                   }
                 } else {
                   resole({
@@ -40828,7 +40826,7 @@ var wfengine_install = function install(Vue) {
         });
       },
       applySubmitTemplate: function applySubmitTemplate($scope, submitTemplate) {
-        var _this4 = this;
+        var _this5 = this;
         if ($scope.curTN.tnIdeaLabelID) {
           $scope.submitHandle.curUserIdea = submitTemplate.curUserIdea;
         }
@@ -40871,7 +40869,7 @@ var wfengine_install = function install(Vue) {
                           self: asyncOrgId.split(',').length > 1
                         } // 查询条件
                       };
-                      _this4.$http(reqParams).then(function (res) {
+                      _this5.$http(reqParams).then(function (res) {
                         if (res.code === 'success') {
                           submitTemplate.route[nodeName].users.forEach(function (user) {
                             for (var j = 0; j < res.body.listdata.length; j++) {
@@ -65600,7 +65598,9 @@ external_commonjs_vue_commonjs2_vue_root_Vue_default().directive('form-title', {
  */
 function txtLblI18nFunc(el, binding, vnode) {
   var field = binding.value;
-  if (field && vnode.context.$i18n.locale !== 'zhCN') {
+
+  //非中文版、流程类文本标签，使用语言包中的配置
+  if (field && (vnode.context.$i18n.locale !== 'zhCN' || field.indexOf('Wflowform') !== -1 || field.indexOf('ModifyWfNodelog') !== -1 || field.indexOf('SubmitHandle') !== -1 || field.indexOf('WfdProcess') !== -1)) {
     var attrs = vnode.data.attrs || {};
     var label = vnode.context.$i18n.generateTitle({
       i18nCode: binding.value

package/lib/ecmappaio.umd.js

@@ -278,9 +278,6 @@ defaultText：默认文本
 */
 function $tx(expression, variables, defaultText) {
   var $scope = this && this.$vnode ? this.$vnode.context : window.$wapp || window.$mapp;
-  if (expression === 'ecwapp.Wflowform.WfTaskNode.designatedDepartment') {
-    debugger;
-  }
   if (!$scope.$i18n) {
     console.log(expression);
     debugger;
@@ -303,9 +300,6 @@ function $tx(expression, variables, defaultText) {
 
 // translate router.meta.title, be used in breadcrumb sidebar tagsview
 function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
-  if (meta.i18nCode === 'keepAttend' || moduleCode === 'submitHandle') {
-    // debugger
-  }
   $scope = $scope || this;
   if ($scope.$i18n && $scope.$i18n.locale === 'zhCN') {
     //中文，按钮，忽略语言包
@@ -313,7 +307,7 @@ function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
       return meta.btnName;
     }
   }
-  if (meta.i18nCode && $scope.$te(meta.i18nCode)) {
+  if (meta.i18nCode && meta.i18nCode.indexOf('.') !== -1 && $scope.$te(meta.i18nCode)) {
     return $scope.$t(meta.i18nCode, variables);
   }
   var moduleInfo = $scope.moduleInfo || $scope.$vnode.context.moduleInfo || $scope.$vnode.context.$vnode.context.moduleInfo;
@@ -40350,6 +40344,7 @@ var wfengine_install = function install(Vue) {
         $scope.canEditBodyfile = canEditBodyfile;
       },
       getWfJsonData: function getWfJsonData($scope, wfInstance, params) {
+        var _this2 = this;
         return new Promise(function (resolve) {
           var wfEngineUrl = params.wfEngineUrl || $scope.wfEngineUrl || 'workflow/wfInstance';
           wfEngineUrl += '/getWfJsonData';
@@ -40426,13 +40421,16 @@ var wfengine_install = function install(Vue) {
               }
               // $scope.submitTemplateList.unshift({ templateName: '---选择办理模板---', valid: true })
               $scope.submitTemplate = $scope.submitTemplateList[0];
+              _this2.$nextTick(function () {
+                $scope.$bus.emit('initSubmitHandle');
+              });
             }
             resolve(res);
           });
         });
       },
       saveWfInstance: function saveWfInstance($scope, submitType, params) {
-        var _this2 = this;
+        var _this3 = this;
         return new Promise(function (resolve) {
           $scope.submitHandle.submitType = submitType;
           delete $scope.submitHandle.selectedNodes;
@@ -40476,7 +40474,7 @@ var wfengine_install = function install(Vue) {
             $scope.submitHandle.busiContent = $scope.vo.flContent;
           }
           var submitHandle = JSON.parse(JSON.stringify($scope.submitHandle));
-          if (submitType.indexOf('Save') !== -1 && submitType !== 'AutoSave') {
+          if (submitType.indexOf('Save') !== -1) {
             js_cookie_default().set('route-index-' + $scope.wfInstance.id, submitHandle.route.index);
             var route = $scope.wfJsonData == null || $scope.wfJsonData.routes == null || $scope.wfJsonData.routes.length === 0 ? {
               taskNodes: []
@@ -40538,7 +40536,7 @@ var wfengine_install = function install(Vue) {
                 delete wfNode.users;
                 submitHandle.nextTNProp.push(wfNode);
                 submitHandle.nextTNUser.push(nextUsers);
-                js_cookie_default().set('route-wfuser-' + $scope.wfInstance.id + '-' + wfNode.id, '', {
+                js_cookie_default().set('route-wfuser-' + $scope.curTN.tnID + '-' + wfNode.id, '', {
                   expires: 0
                 });
               }
@@ -40609,7 +40607,7 @@ var wfengine_install = function install(Vue) {
                 }
                 if (res.body.wfInstance.passenger.commandBar) {
                   var commandBar = JSON.parse(JSON.stringify(res.body.wfInstance.passenger.commandBar));
-                  _this2.setCommandBar($scope, commandBar);
+                  _this3.setCommandBar($scope, commandBar);
                   $scope.commandBar = commandBar;
                 }
                 $scope.vo = $scope.vobak;
@@ -40636,7 +40634,7 @@ var wfengine_install = function install(Vue) {
                 if (typeof $scope.onWflowFormSubmited === 'function') {
                   $scope.onWflowFormSubmited($scope);
                 }
-                _this2.$nextTick(function () {
+                _this3.$nextTick(function () {
                   $scope.$bus.emit('initSubmitHandle');
                 });
               } else {
@@ -40767,7 +40765,7 @@ var wfengine_install = function install(Vue) {
         };
       },
       checkOuterDeputy: function checkOuterDeputy($scope, params) {
-        var _this3 = this;
+        var _this4 = this;
         return new Promise(function (resole) {
           if ($scope.submitHandle.needCheckOuterDeputy && $scope.submitHandle.needCheckOuterDeputy.length > 0) {
             var nextTNUsers = $scope.submitHandle.needCheckOuterDeputy;
@@ -40817,7 +40815,7 @@ var wfengine_install = function install(Vue) {
                       message: '已选择外出代理人。'
                     });
                   } else {
-                    _this3.$bus.emit('selectOuterDeputys', outerDeputys, $scope.submitHandle.route, resole);
+                    _this4.$bus.emit('selectOuterDeputys', outerDeputys, $scope.submitHandle.route, resole);
                   }
                 } else {
                   resole({
@@ -40838,7 +40836,7 @@ var wfengine_install = function install(Vue) {
         });
       },
       applySubmitTemplate: function applySubmitTemplate($scope, submitTemplate) {
-        var _this4 = this;
+        var _this5 = this;
         if ($scope.curTN.tnIdeaLabelID) {
           $scope.submitHandle.curUserIdea = submitTemplate.curUserIdea;
         }
@@ -40881,7 +40879,7 @@ var wfengine_install = function install(Vue) {
                           self: asyncOrgId.split(',').length > 1
                         } // 查询条件
                       };
-                      _this4.$http(reqParams).then(function (res) {
+                      _this5.$http(reqParams).then(function (res) {
                         if (res.code === 'success') {
                           submitTemplate.route[nodeName].users.forEach(function (user) {
                             for (var j = 0; j < res.body.listdata.length; j++) {
@@ -65610,7 +65608,9 @@ external_commonjs_vue_commonjs2_vue_root_Vue_default().directive('form-title', {
  */
 function txtLblI18nFunc(el, binding, vnode) {
   var field = binding.value;
-  if (field && vnode.context.$i18n.locale !== 'zhCN') {
+
+  //非中文版、流程类文本标签，使用语言包中的配置
+  if (field && (vnode.context.$i18n.locale !== 'zhCN' || field.indexOf('Wflowform') !== -1 || field.indexOf('ModifyWfNodelog') !== -1 || field.indexOf('SubmitHandle') !== -1 || field.indexOf('WfdProcess') !== -1)) {
     var attrs = vnode.data.attrs || {};
     var label = vnode.context.$i18n.generateTitle({
       i18nCode: binding.value