cloud-web-corejs 1.0.284 → 1.0.286

package/src/components/mobile/wf/deleteTaskUserDialog.vue

@@ -1,54 +1,73 @@
-<template>
-  <div class="pop-box" :style="'z-index:'+zIndex">
-    <div>
-      <div class="header-box">
-        <i class="back el-icon-close" @click="dialogClose"></i>
-        {{ $t2('减签', 'components.wf.deleteIncreaseSign') }}
-        <template v-if="!wfInfo.wfAdmin">
-          ({{ $t2('注：只允许删除本人新增的加签', 'components.wf.deleteIncreaseSignTip2') }})
-        </template>
-        <span>—</span>
-        <b class="f-red">
-          {{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}
-        </b>
-      </div>
-      <div class="flex">
-        <div class="checkbox-all_list" @scroll="handleScroll">
-          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
-               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
-            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
-            <div class="t1">
-              <i class="icon"></i>
-              <span>{{ row.name }}</span>
-            </div>
-            <div class="t2">
-              <p>候选人ID：{{ row.id }}</p>
-            </div>
-          </div>
-        </div>
-        <div class="checkbox-all">
-          <div class='ca-t'>已选择候选人：</div>
-          <div class="ca-c">
-          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.name }}<i
-            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
-          </div>
-        </div>
-      </div>
-      <div class="fixed-bottom-btns">
-        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
-        </el-button>
-        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">确 定</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
-import mixin from './mixins/deleteTaskUserDialogMixin';
-
-export default {
-  name: 'deleteTaskUserDialog',
-  mixins: [selectDialogMixins, mixin]
-};
-</script>
+<template>
+  <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
+       原来的 :style="'z-index:'+zIndex" 去掉了：层级由 element 的 PopupManager
+       统一分配给 .el-dialog__wrapper，再手写一层反而会和它打架。 -->
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :append-to-body="true"
+    :modal="false"
+    :show-close="false"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    custom-class="h5-pop-dialog"
+    width="100%"
+    top="0px"
+    @close="dialogClose"
+  >
+    <div>
+      <div class="header-box">
+        <i class="back el-icon-close" @click="dialogClose"></i>
+        {{ $t2('减签', 'components.wf.deleteIncreaseSign') }}
+        <template v-if="!wfInfo.wfAdmin">
+          ({{ $t2('注：只允许删除本人新增的加签', 'components.wf.deleteIncreaseSignTip2') }})
+        </template>
+        <span>—</span>
+        <b class="f-red">
+          {{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}
+        </b>
+      </div>
+      <div class="flex">
+        <div class="checkbox-all_list" @scroll="handleScroll">
+          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
+               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
+            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
+            <div class="t1">
+              <i class="icon"></i>
+              <span>{{ row.name }}</span>
+            </div>
+            <div class="t2">
+              <p>候选人ID：{{ row.id }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="checkbox-all">
+          <div class='ca-t'>已选择候选人：</div>
+          <div class="ca-c">
+          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.name }}<i
+            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
+          </div>
+        </div>
+      </div>
+      <div class="fixed-bottom-btns">
+        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
+        </el-button>
+        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">确 定</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
+import mixin from './mixins/deleteTaskUserDialogMixin';
+
+export default {
+  name: 'deleteTaskUserDialog',
+  mixins: [selectDialogMixins, mixin],
+  data() {
+    return {
+      dialogVisible: true
+    };
+  }
+};
+</script>

package/src/components/mobile/wf/mixins/wfModifyDialogMixin.js

@@ -1,12 +1,13 @@
-import {requireViewCompat} from "@base/utils/resolveViewComponent";
+import {requireViewAsync} from "@base/utils/resolveViewComponent";
 
 let mixin = {};
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
-  // 归属自己 / 包内组件本地渲染；归属别家子应用（remote）或缺文件时返回 null，
-  // 不再抛错崩溃。归属解析见 @base/utils/resolveViewComponent。
+  // 归属自己 / 包内组件本地渲染；归属别家子应用（remote）、缺文件或 chunk 加载失败时
+  // 解析为 null，不抛错崩溃。返回 Promise，调用方必须 await。
+  // 归属解析见 @base/utils/resolveViewComponent。
   requireView: (url) => {
-    return requireViewCompat(url);
+    return requireViewAsync(url);
   },
 };
 mixin = {
@@ -30,11 +31,12 @@ mixin = {
     this.openWfModifyDialog(this.code);
   },
   methods: {
-    openWfModifyDialog() {
+    async openWfModifyDialog() {
       let row = this.paramData;
       let url = row.mobileurl + ".vue";
       this.showModifyDialog = true;
-      this.content = configUtil.requireView(url);
+      // await 之后再 $openEditView：它是 200ms 定时放行，冷启动拉 chunk 常超过它
+      this.content = await configUtil.requireView(url);
       this.$openEditView("showBillEdit");
     },
     close() {

package/src/components/mobile/wf/selectUserDialog.vue

@@ -0,0 +1,118 @@
+<template>
+  <!-- 移动版「选择用户」弹层（转办人 / 沟通对象 / 候选人）。
+       来源是 views/mobile/user/user/dialog.vue，那份仍被手写移动页用着、且
+       src/views 不随包发布，所以这里另起一份收进包内，原文件保持原样不动。
+
+       与原文件的差别只有三处：
+       1. 外壳从 <div class="pop-box"> 换成 el-dialog + append-to-body —— 节点挂到
+          document.body，不再依赖 position:fixed 在宿主子树里侥幸生效（祖先一旦有
+          transform / display:none 就废），层级交给 element 的 PopupManager；
+       2. 去掉 :style="'z-index:'+zIndex"，同上，避免和 PopupManager 打架；
+       3. 不再 @import resources/css/h5.scss —— 那份不随包发布，且原文件用的是
+          非 scoped 的 <style>，等于把整份手写移动页样式泄成全局。本组件的骨架样式
+          走 xform/styles/h5.scss 的 .h5-pop-dialog（顶层选择器，body 挂载后才命中）。 -->
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :title="$t1('选择用户')"
+    :append-to-body="true"
+    :modal="false"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    custom-class="dialog-style h5view-dialog"
+    width="100%"
+    top="0px"
+    @close="dialogClose"
+  >
+    <div class="selected-flex-box">
+      <div class="search-H5box">
+        <div class="txt">
+          <el-input placeholder="姓名" suffix-icon="el-icon-search" v-model="formData.nickName"
+                    @keyup.enter.native="searchEvent">
+            <el-button slot="append" @click="searchEvent"> 搜索</el-button>
+          </el-input>
+        </div>
+        <div class="icon-screen" @click="popStatus = true">
+          <i class="iconfont icon-shaixuan1"></i>
+          <span>{{ $t1('高级筛选') }}</span>
+        </div>
+      </div>
+      <div class="flex">
+        <div class="checkbox-all_list" @scroll="handleScroll">
+          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
+               :class="{on:isChecked(row)}" @click="changeCheck(row,rowIndex)">
+            <div class="is-checked" v-if="isChecked(row)"><i class="el-icon-check"></i>已选择</div>
+            <div class="t1">
+              <i class="icon"></i>
+              <span>{{ row.nickName }}</span>
+            </div>
+            <div class="t2">
+              <p>登录名：{{ row.loginAccount }}</p>
+              <p>角色：{{ row.roleNames }}</p>
+              <p>机构：{{ row.saleOrgNames }}</p>
+              <p>邮编：{{ row.zipCode }}</p>
+              <p>地址：{{ row.address }}</p>
+              <p>性别：{{ genderMap[row.gender] }}</p>
+              <p>所属组织：{{ row.companyNames }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="checkbox-all">
+          <div class='ca-t'>已选择用户：</div>
+          <div class="ca-c">
+          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.nickName }}<i
+            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
+          </div>
+        </div>
+      </div>
+      <h5SearchDialog v-if="popStatus" :visiable.sync="popStatus" @searchEvent="confirmSearchDialog"
+                      @resetEvent="resetSearchDialog">
+        <el-form label-position="top">
+          <el-form-item label="登录名">
+            <el-input v-model="formData.loginAccount" class="txt" clearable/>
+          </el-form-item>
+          <el-form-item label="姓名">
+            <el-input v-model="formData.nickName" class="txt" clearable/>
+          </el-form-item>
+        </el-form>
+      </h5SearchDialog>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">{{ $t1('取 消') }}
+      </el-button>
+      <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">{{ $t1('确 定') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import mixin from "@base/mixins/mobile/selectDialog/index";
+
+export default {
+  name: 'selectUserDialog',
+  mixins: [mixin],
+  props: ['visiable', 'multi', 'rows', 'param'],
+  data() {
+    return {
+      // 父级用 v-if 控制存活，组件一挂载就是「已打开」。关闭统一走 dialogClose()
+      // 向父级 $emit('update:visiable', false)，由父级的 v-if 销毁本组件。
+      dialogVisible: true,
+      genderMap: {1: '男', 2: '女'}
+    };
+  },
+  created() {
+    this.initSetting({
+      url: USER_PREFIX + '/user/listCurrentPage',
+      param: () => {
+        return {
+          enabled: true,
+          ...this.formData,
+          ...this.param,
+        }
+      }
+    })
+  },
+  mounted() {
+    this.searchEvent();
+  }
+};
+</script>

package/src/components/mobile/wf/setCandidateDialog.vue

@@ -1,48 +1,69 @@
-<template>
-  <div>
-    <div class="pop-box">
-      <div>
-        <div class="header-box">
-          <i class="back el-icon-close" @click="dialogClose"></i>
-          {{ $t2('修改候选人', 'components.wf.setCandidateTitle') }}<span>—</span>
-          <b class="f-red">{{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}</b>
-        </div>
-        <div class="flex">
-          <div class="checkbox-all_list">
-            <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item">
-              <div class="t1">
-                <i class="icon"></i>
-                <span>候选人：{{ getUsernames(row) }}</span>
-              </div>
-              <div class="t2">
-                <p>节点名称：{{ row.nodeName }}</p>
-              </div>
-              <div class="btns">
-                <el-button type="primary" plain class="btn" @click="openUserDialig(row, rowIndex)" icon="el-icon-edit">
-                  设置候选人
-                </el-button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="fixed-bottom-btns">
-          <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消</el-button>
-          <el-button type="primary" class="btn" @click="dialogClose" icon="el-icon-check">确 定</el-button>
-        </div>
-      </div>
-    </div>
-    <user-dialog v-if="showUserDialog" :visiable.sync="showUserDialog" @close="showUserDialog = false"
-                 @confirm="userConfirm" multi="true" :rows="userRows"></user-dialog>
-  </div>
-</template>
-
-<script>
-import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
-import mixin from './mixins/setCandidateDialogMixin';
-import userDialog from "../../../views/mobile/user/user/dialog.vue";
-
-export default {
-  mixins: [selectDialogMixins, mixin],
-  components: {userDialog}
-};
-</script>
+<template>
+  <div>
+    <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
+         下面的选用户弹层是本弹层里再弹一层，两层都由 PopupManager 递增发号，
+         后开的天然在上，不用手写 z-index。 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :append-to-body="true"
+      :modal="false"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      custom-class="h5-pop-dialog"
+      width="100%"
+      top="0px"
+      @close="dialogClose"
+    >
+      <div>
+        <div class="header-box">
+          <i class="back el-icon-close" @click="dialogClose"></i>
+          {{ $t2('修改候选人', 'components.wf.setCandidateTitle') }}<span>—</span>
+          <b class="f-red">{{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}</b>
+        </div>
+        <div class="flex">
+          <div class="checkbox-all_list">
+            <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item">
+              <div class="t1">
+                <i class="icon"></i>
+                <span>候选人：{{ getUsernames(row) }}</span>
+              </div>
+              <div class="t2">
+                <p>节点名称：{{ row.nodeName }}</p>
+              </div>
+              <div class="btns">
+                <el-button type="primary" plain class="btn" @click="openUserDialig(row, rowIndex)" icon="el-icon-edit">
+                  设置候选人
+                </el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="fixed-bottom-btns">
+          <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消</el-button>
+          <el-button type="primary" class="btn" @click="dialogClose" icon="el-icon-check">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <user-dialog v-if="showUserDialog" :visiable.sync="showUserDialog" @close="showUserDialog = false"
+                 @confirm="userConfirm" multi="true" :rows="userRows"></user-dialog>
+  </div>
+</template>
+
+<script>
+import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
+import mixin from './mixins/setCandidateDialogMixin';
+// 选用户弹层改用包内的 selectUserDialog（el-dialog 版）。原来引的
+// views/mobile/user/user/dialog.vue 仍是 .pop-box 版、且不随包发布，保持原样不动。
+import userDialog from "./selectUserDialog.vue";
+
+export default {
+  mixins: [selectDialogMixins, mixin],
+  components: {userDialog},
+  data() {
+    return {
+      dialogVisible: true
+    };
+  }
+};
+</script>

package/src/components/mobile/wf/urgingDialog.vue

@@ -1,52 +1,75 @@
-<template>
-  <div class="pop-box">
-    <div>
-      <div class="header-box">
-        <i class="back el-icon-close" @click="dialogClose"></i>
-        {{ $t2('流程催办', 'components.wf.wfUrging') }}<span>—</span><b
-        class="f-red">{{ $t2('节点', 'components.wf.node') }}：{{
-          wfInfo.taskName
-        }}</b>
-      </div>
-      <div class="flex">
-        <div class="checkbox-all_list" @scroll="handleScroll">
-          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
-               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
-            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
-            <div class="t1">
-              <i class="icon"></i>
-              <span>{{ row.name }}</span>
-            </div>
-            <div class="t2">
-              <p>催办人ID：{{ row.id }}</p>
-            </div>
-          </div>
-        </div>
-        <div class="checkbox-all">
-          <div class='ca-t'>已选择用户：</div>
-          <div class="ca-c">
-          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.name }}<i
-            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
-          </div>
-        </div>
-      </div>
-      <div class="fixed-bottom-btns">
-        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
-        </el-button>
-        <el-button type="primary" class="btn" @click="subUrgingForm" icon="el-icon-check">
-          {{ $t2('确认催办', 'components.wf.confirmUrging') }}
-        </el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
-import mixin from './mixins/urgingDialogMixin';
-
-export default {
-  name: 'urgingDialog',
-  mixins: [selectDialogMixins, mixin]
-};
-</script>
+<template>
+  <!-- 外壳是 el-dialog + append-to-body：节点挂到 document.body，不再依赖
+       `position:fixed` 在宿主子树里侥幸生效（祖先一旦有 transform/display:none 就废），
+       层级也交给 element 的 PopupManager，不用再手写 z-index。
+       el-dialog 自带的表头关掉——标题和关闭按钮都在下面的 .header-box 里。
+       骨架样式见 xform/styles/h5.scss 的 .h5-pop-dialog（必须是顶层选择器）。 -->
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :append-to-body="true"
+    :modal="false"
+    :show-close="false"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    custom-class="h5-pop-dialog"
+    width="100%"
+    top="0px"
+    @close="dialogClose"
+  >
+    <div>
+      <div class="header-box">
+        <i class="back el-icon-close" @click="dialogClose"></i>
+        {{ $t2('流程催办', 'components.wf.wfUrging') }}<span>—</span><b
+        class="f-red">{{ $t2('节点', 'components.wf.node') }}：{{
+          wfInfo.taskName
+        }}</b>
+      </div>
+      <div class="flex">
+        <div class="checkbox-all_list" @scroll="handleScroll">
+          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
+               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
+            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
+            <div class="t1">
+              <i class="icon"></i>
+              <span>{{ row.name }}</span>
+            </div>
+            <div class="t2">
+              <p>催办人ID：{{ row.id }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="checkbox-all">
+          <div class='ca-t'>已选择用户：</div>
+          <div class="ca-c">
+          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.name }}<i
+            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
+          </div>
+        </div>
+      </div>
+      <div class="fixed-bottom-btns">
+        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
+        </el-button>
+        <el-button type="primary" class="btn" @click="subUrgingForm" icon="el-icon-check">
+          {{ $t2('确认催办', 'components.wf.confirmUrging') }}
+        </el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
+import mixin from './mixins/urgingDialogMixin';
+
+export default {
+  name: 'urgingDialog',
+  mixins: [selectDialogMixins, mixin],
+  data() {
+    // 父级用 v-if 控制存活，组件一挂载就是「已打开」。关闭统一走 dialogClose()
+    // 向父级 $emit('update:visiable', false)，由父级的 v-if 销毁本组件。
+    return {
+      dialogVisible: true
+    };
+  }
+};
+</script>

package/src/components/mobile/wf/wfModifyDialog.vue

@@ -1,4 +1,8 @@
 <template>
+  <!-- 注意：这一个没有跟着「移动版流程弹层改 el-dialog + append-to-body」那一轮走，
+       仍是 .pop-box 就地渲染。原因是 H5 不需要「修改单据」——xform H5 底栏明确
+       不放这个按钮（见 form-render/container-item/detail-h5-item.vue 的说明），
+       它只从手写移动页的 buttonGroup 进。样式仍走各应用自己的 h5.scss。 -->
   <div class="pop-box">
     <div>
       <div class="header-box">

package/src/components/table/index.js

@@ -97,7 +97,7 @@ async function initVxeTable(option) {
   let searchColumns = null;
   if (tableName) {
     setTableState($grid, "tableName", tableName);
-    if (option.path) {
+    if (option.path && option.readQueryAllPage !== false) {
       await getTableData(that, option.tableRef, "isQueryAllPage", (res1) => {
         let result = res1.objx ? res1.objx.data : null;
         if (result !== null && result !== undefined) {
@@ -1252,7 +1252,10 @@ function checkQueryTotal(that, tableRef, value) {
   let pagerConfig = $grid.pagerConfig;
 
   $grid.pagerConfig.layouts = pagerConfig.layouts || [];
-  addTableData(that, tableRef, value);
+  let originOption = $grid.params && $grid.params.originOption;
+  if (!originOption || originOption.readQueryAllPage !== false) {
+    addTableData(that, tableRef, value);
+  }
   $grid.commitProxy("query");
 }