cloud-web-corejs 1.0.99 → 1.0.101

package/src/views/user/user/dialog.vue

@@ -62,7 +62,7 @@
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ checkRow.nickName }}</p>
+          <p>{{ getCheckLabel(checkRow,'nickName') }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>

package/src/views/user/wf/wf_obj_config/list.vue

@@ -105,9 +105,9 @@
       <iframe :src="wfUrl" :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"></iframe>
     </el-dialog>
 
-    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser"
+    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser" :rows="wfAssignData" labelKey="loginAccount"
                 :multi.sync="wfAssignMulti"/>
-    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
+    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" :rows="wfAssignPositionData" @confirm="confirmPosition"/>
     <scriptDescriptionDialog path="static/readme/Wf.txt" v-if="showScriptDescriptionDialog"
                              :visiable.sync="showScriptDescriptionDialog"></scriptDescriptionDialog>
     <wfBizDataSettingDialog v-if="showWfBizDataSettingDialog" :visiable.sync="showWfBizDataSettingDialog"
@@ -590,6 +590,7 @@ export default {
     },
     initWinUserDialog() {
       window.openAssignUserDialog = opts => {
+        debugger
         this.wfAssignMulti = opts.multi;
         this.wfAssignData = opts.data || [];
         this.wfAssignCallback = opts.callback;