cloud-web-corejs 1.0.116 → 1.0.118

package/src/components/table/util/index.js

@@ -314,7 +314,7 @@ function domRender(dom) {
       });
       return arr.join("");
     } else {
-      if (item.nodeName == "INPUT") {
+      if (item.nodeName == "INPUT" || item.nodeName == "TEXTAREA") {
         return item.value;
       } else if (item.innerText != null && item.innerText != "") {
         return item.innerText;

package/src/components/tempStorage/index.vue

@@ -1,11 +1,11 @@
 <template>
   <span class="button-sty">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain>暂存</el-button>
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain :disabled="disabled">暂存</el-button>
       <el-tooltip class="item" effect="dark" content="查看暂存数据" placement="top">
-        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" ></el-button>
+        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" :disabled="disabled"></el-button>
       </el-tooltip>
 
-      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog" 
+      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog"
                          @confirm="confirmTempStorageDialog" :storageType="storageType" multi="false"/>
     <el-dialog
       v-if="showSubmitDialog"
@@ -54,7 +54,8 @@ import tempStorageDialog from "./tempStorageDialog.vue";
 
 export default {
   props: {
-    option: Object
+    option: Object,
+    disabled: Boolean,
   },
   components: {
     tempStorageDialog
@@ -82,7 +83,10 @@ export default {
       let url = USER_PREFIX + '/temp_storage/save';
       let billData = this.option.data() || {};
       let data = JSON.stringify(billData)
-      this.$http({
+
+      let that = this.option.vue || this.$$attrs["parent-target"] || this.$parent;
+      this.showSubmitDialog = false;
+      that.$http({
         url: url,
         method: `post`,
         data: {
@@ -99,7 +103,6 @@ export default {
             duration: 500,
             onClose: t => {
               this.option.saveConfirm && this.option.saveConfirm(res);
-              this.showSubmitDialog = false;
             }
           });
         }

package/src/components/tempStorage/tempStorageDialog.vue

@@ -60,7 +60,7 @@
       <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
           <p>{{ checkRow.storageCode }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>

package/src/components/wf/content.vue

@@ -72,6 +72,7 @@
           <div>
             <b :class="{on:tabIndex=='1'}" @click="tabIndex='1'">{{ $t2('任务情况', 'components.wf.taskInfo') }}</b>
             <b :class="{on:tabIndex=='2'}" @click="tabIndex='2'" v-if="toTalk">{{ $t2('流程沟通', 'components.wf.wfTalk') }}</b>
+            <b :class="{on:tabIndex=='4'}" @click="tabIndex='4'" v-if="showCandidate">{{ $t1('节点候选人') }}</b>
             <b :class="{on:tabIndex=='3'}" @click="tabIndex='3'" v-if="showAllWfOpinon">{{ $t2('全部任务情况', 'components.wf.allTaskInfo') }}</b>
           </div>
         </div>
@@ -220,6 +221,20 @@
             </div>
           </div>
         </div>
+        <template v-if="showCandidate">
+          <div v-show="tabIndex=='4'">
+              <div style="width:800px">
+                <vxe-grid
+                  ref="table-candidate"
+                  v-bind="candidateOption"
+                  :data="candidateDatas"
+                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                  @custom="$vxeTableUtil.customHandle"
+                ></vxe-grid>
+              </div>
+          </div>
+        </template>
+
       </div>
       <!--沟通-->
       <el-dialog
@@ -761,7 +776,8 @@
       <setCandidateDialog v-if="showSetCandidateDialog" :visiable.sync="showSetCandidateDialog"
                           @close="closeSetCandidateDialog"
                           :wfInfo="wfInfo"
-                          :current_prefix="current_prefix"></setCandidateDialog>
+                          :current_prefix="current_prefix"
+                          :wfUserRangeEnabled="wfUserRangeEnabled"></setCandidateDialog>
     </template>
   </baseTabPane>
   <div v-else></div>