cloud-web-corejs 1.0.54-dev.736 → 1.0.54-dev.738

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.736",
+  "version": "1.0.54-dev.738",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/wf/mixins/setCandidateDialog.js

@@ -42,7 +42,7 @@ moudule = {
     confirmWfTaskUserRangeDialog(rows){
       let $grid = this.$refs["table-m1"];
       let item = $grid.getTableData().fullData[this.operateIndex];
-      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs || [];
       let item1s = [];
       let item2s = []
       rows.forEach(row => {
@@ -169,7 +169,7 @@ moudule = {
     userConfirm(rows) {
       let $grid = this.$refs["table-m1"];
       let item = $grid.getTableData().fullData[this.operateIndex];
-      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs || [];
       let item1s = [];
       let item2s = []
       rows.forEach(row => {

package/src/components/wf/mixins/setCandidateDialog2.js

@@ -68,7 +68,7 @@ moudule = {
     confirmWfTaskUserRangeDialog(rows){
       let $grid = this.$refs["table-m1"];
       let item = $grid.getTableData().fullData[this.operateIndex];
-      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs || [];
       let item1s = [];
       let item2s = []
       rows.forEach(row => {
@@ -165,7 +165,7 @@ moudule = {
     userConfirm(rows) {
       let $grid = this.$refs["table-m1"];
       let item = $grid.getTableData().fullData[this.operateIndex];
-      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs || [];
       let item1s = [];
       let item2s = []
       rows.forEach(row => {

package/src/store/modules/user.js

@@ -298,6 +298,7 @@ actions = {
     return new Promise((resolve, reject) => {
       configUtil.logout({
         success: (res) => {
+          let ssoLogin = sessionStorage.getItem("ssoLogin");
           actions
             .resetToken({
               commit,
@@ -305,6 +306,9 @@ actions = {
               dispatch,
             })
             .then(() => {
+              if(ssoLogin==="true"){
+                sessionStorage.setItem("ssoLogin", "true");
+              }
               resolve();
             });
         },

package/src/views/bd/setting/form_script/form_list.vue

@@ -35,6 +35,14 @@
                     v-if="isDev && menuKindAuth.addAuth === 1"
                     >{{ $t1("新增") }}
                   </vxe-button>
+                  <vxe-button
+                    status="success"
+                    class="button-sty"
+                    icon="el-icon-upload2"
+                    @click="jsonExport"
+                    v-if="isDev && menuKindAuth.exportAuth === 1"
+                    >{{ $t1("导出发布") }}
+                  </vxe-button>
                   <projectTagAddButton
                     :option="addProjectTagOption"
                     v-if="isDev && menuKindAuth.editAuth === 1"

package/src/views/bd/setting/form_script/mixins/form_list.js

@@ -91,6 +91,14 @@ modules = {
       this.checkTags = [];
       this.$refs["table-m1"].commitProxy("reload");
     },
+    jsonExport() {
+      this.$jsonExport({
+        title: "表单脚本",
+        targetRef: "table-m1",
+        url: USER_PREFIX + "/form_develop/exportFormScript",
+        abcEnabled: true,
+      });
+    },
     openEditDialog(row) {
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';