cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.6",
+  "version": "1.1.0-dev.7",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/VabUpload/view.vue

@@ -176,16 +176,21 @@
     />
     <!-- H5 非图片文件预览：结构与 mobile/wf/content.vue 的流程图预览一致，
          样式走 xform/styles/h5.scss 块 L 的 .pop-box（全屏 fixed + 内部 flex）。
-         只在宿主传了 h5Preview 时才会被 openPreview 打开，PC 上永远不渲染。 -->
-    <div class="pop-box" v-if="showFilePreviewDialog">
-      <div>
-        <div class="header-box">
-          <i
-            class="back el-icon-close"
-            @click="showFilePreviewDialog = false"
-          ></i>
-          {{ $t2("文件预览", "components.VabUpload.filePreview") }}
-        </div>
+         只在宿主传了 h5Preview 时才会被 openPreview 打开，PC 上永远不渲染。 -->
+    <el-dialog
+      title="文件预览"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      :visible.sync="showFilePreviewDialog"
+      :modal="false"
+      custom-class="dialog-style h5view-dialog"
+      width="100%"
+      top="0px"
+      v-el-drag-dialog
+      v-el-dialog-center
+      :append-to-body	="true"
+      :destroy-on-close="true"
+    >
         <div class="flex">
           <div class="form-box">
             <div class="tit">
@@ -196,22 +201,18 @@
               :src="previewFileUrl"
             ></iframe>
           </div>
-        </div>
-        <!-- 与流程图预览/任务情况预览同款：底部一个铺满行的「关 闭」。
-             .btn 的 flex:1 由 xform/styles/h5.scss 块 L 给，单个按钮自动占满。 -->
-        <div class="fixed-bottom-btns">
-          <el-button
-            type="primary"
-            plain
-            class="btn"
-            icon="el-icon-close"
-            @click="showFilePreviewDialog = false"
-          >
-            {{ $t2("关 闭", "system.button.close2") }}
-          </el-button>
-        </div>
-      </div>
-    </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            icon="el-icon-close"
+            @click="showFilePreviewDialog = false"
+            >{{$t2('关 闭', 'system.button.close2')}}</el-button
+          >
+        </span>
+      </el-dialog>
   </div>
 </template>
 

package/src/components/excelImport/index.vue

@@ -1,156 +1,156 @@
-<template>
-  <div v-if="showContent">
-    <el-dialog
-      :title="option.title || $t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
-      :modal-append-to-body="falseValue"
-      :close-on-click-modal="falseValue"
-      :visible.sync="showImportDialog"
-      :modal="falseValue"
-      custom-class="dialog-style"
-      width="501px"
-      v-el-drag-dialog
-    >
-      <div class="import-box">
-        <template v-if="!!option.excel">
-          <div class="tips">{{ $t2('请下载文件模板，填写信息后再上传文件', 'components.excelImport.tip') }}</div>
-          <el-button type="success" plain class="button-sty template-btn" @click="commonLocalDownload()">
-            {{ $t2('模板下载', 'components.excelImport.downloadBUtton') }}
-          </el-button>
-        </template>
-        <el-upload v-if="!fileRaw" ref="uploadBtn" action="" class="upload-file" :auto-upload="false"
-                   :on-change="fileChange">
-          <div class="el-upload-dragger">
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text"><em>{{ $t2('点击上传', 'components.excelImport.uploadBUtton') }}</em></div>
-          </div>
-        </el-upload>
-        <div class="upload-finish" v-if="fileRaw">
-          <img :src="$assetUrl(require('@/resources' + '/images/ico-excel.svg'))" class="ico"/>
-          <p class="name">{{ fileRaw.name }}</p>
-          <!-- <p>2022-1-17</p> -->
-          <el-tooltip :enterable="false" class="item" effect="dark"
-                      :content="$t2('关闭', 'components.excelImport.closeBUtton')" placement="bottom">
-            <i
-              class="el-icon-error js-close"
-              @click="
-								fileRaw = false;
-								$refs.uploadBtn.clearFiles();
-							"
-            ></i>
-          </el-tooltip>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-				<el-button type="primary" plain class="button-sty" @click="dialogClose1">
-					<i class="el-icon-close el-icon"></i>
-					{{ $t2('取 消', 'system.button.cancel2') }}
-				</el-button>
-				<el-button type="primary" @click="dialogPrimary1" class="button-sty">
-					<i class="el-icon-check el-icon"></i>
-					{{ $t2('确 定', 'system.button.confirm2') }}
-				</el-button>
-			</span>
-    </el-dialog>
-    <el-dialog
-      ref="importDialog"
-      :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
-      :modal-append-to-body="falseValue"
-      :close-on-click-modal="falseValue"
-      :visible.sync="showImportDialog2"
-      :modal="falseValue"
-      custom-class="dialog-style"
-      width="501px"
-      height="250px"
-      :beforeClose="handleBeforeClose"
-      @close="handleClose2"
-      v-el-drag-dialog
-    >
-      <div>
-        <div class="import-box">
-          <div class="tips">
-            {{ $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
-            <!-- <span class="fr">耗时：<em class="time-txt">0 时 0 分 0 秒 </em></span> -->
-          </div>
-          <el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
-                       class="export-progress"></el-progress>
-          <div class="i-status">
-            <div class="item">
-              <i class="el-icon-success f-green"></i>
-              {{ $t2('成功', 'components.excelImport.success') }}：
-              <span class="successNum" @click="showSuccessResult">{{ totalSuccessNum }}</span>
-            </div>
-            <div class="item">
-              <i class="el-icon-error f-red"></i>
-              {{ $t2('失败', 'components.excelImport.fail') }}：
-              <span class="failNum" @click="showErrorResult">{{ totalErrorNum }}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer" center="true">
-        <div class="fl import-count">
-          <span class="f-red doneNum">0</span>
-          /
-          <span class="dataSize">0</span>
-        </div>
-        <el-button type="primary" plain class="button-sty" @click="dialogClose2">
-          <i class="el-icon-close el-icon"></i>
-          {{ $t2('取 消', 'system.button.cancel2') }}
-        </el-button>
-        <el-button type="primary" class="button-sty" @click="dialogPrimary2">
-          <i class="el-icon-check el-icon"></i>
-          {{ $t2('确 定', 'system.button.confirm2') }}
-        </el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :title="$t2('结果', 'components.excelImport.resultTitle')"
-      :append-to-body="true"
-      :modal-append-to-body="true"
-      :close-on-click-modal="falseValue"
-      :visible.sync="showImportResult"
-      :modal="falseValue"
-      custom-class="dialog-style list-dialog"
-      width="1200px"
-      v-el-drag-dialog
-    >
-      <div>
-        <div class="box-style">
-          <div class="cont">
-            <div class="table-div">
-              <vxe-grid
-                id="resGrid"
-                ref="resGrid"
-                height="440px"
-                v-bind="resOption"
-                @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                @custom="$vxeTableUtil.customHandle"
-              >
-                <template #form>
-                  <div class="clearfix screen-btns">
-                    <div class="fl">
-                      <vxe-button status="primary" class="button-sty" icon="el-icon-upload2" @click="exportToExcel()">
-                        {{ $t1('导出') }}
-                      </vxe-button>
-                    </div>
-                    <div class="fr"></div>
-                  </div>
-                </template>
-              </vxe-grid>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {mixins} from './mixins';
-
-export default {
-  mixins: [mixins]
-};
-</script>
+<template>
+  <div v-if="showContent">
+    <el-dialog
+      :title="option.title || $t2('导入', 'components.excelImport.title')"
+      :append-to-body="falseValue"
+      :modal-append-to-body="falseValue"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportDialog"
+      :modal="falseValue"
+      custom-class="dialog-style"
+      width="501px"
+      v-el-drag-dialog
+    >
+      <div class="import-box">
+        <template v-if="!!option.excel">
+          <div class="tips">{{ $t2('请下载文件模板，填写信息后再上传文件', 'components.excelImport.tip') }}</div>
+          <el-button type="success" plain class="button-sty template-btn" @click="commonLocalDownload()">
+            {{ $t2('模板下载', 'components.excelImport.downloadBUtton') }}
+          </el-button>
+        </template>
+        <el-upload v-if="!fileRaw" ref="uploadBtn" action="" class="upload-file" :auto-upload="false"
+                   :on-change="fileChange">
+          <div class="el-upload-dragger">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text"><em>{{ $t2('点击上传', 'components.excelImport.uploadBUtton') }}</em></div>
+          </div>
+        </el-upload>
+        <div class="upload-finish" v-if="fileRaw">
+          <img :src="$assetUrl(require('@/resources' + '/images/ico-excel.svg'))" class="ico"/>
+          <p class="name">{{ fileRaw.name }}</p>
+          <!-- <p>2022-1-17</p> -->
+          <el-tooltip :enterable="false" class="item" effect="dark"
+                      :content="$t2('关闭', 'components.excelImport.closeBUtton')" placement="bottom">
+            <i
+              class="el-icon-error js-close"
+              @click="
+								fileRaw = false;
+								$refs.uploadBtn.clearFiles();
+							"
+            ></i>
+          </el-tooltip>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+				<el-button type="primary" plain class="button-sty" @click="dialogClose1">
+					<i class="el-icon-close el-icon"></i>
+					{{ $t2('取 消', 'system.button.cancel2') }}
+				</el-button>
+				<el-button type="primary" @click="dialogPrimary1" class="button-sty">
+					<i class="el-icon-check el-icon"></i>
+					{{ $t2('确 定', 'system.button.confirm2') }}
+				</el-button>
+			</span>
+    </el-dialog>
+    <el-dialog
+      ref="importDialog"
+      :title="$t2('导入', 'components.excelImport.title')"
+      :append-to-body="falseValue"
+      :modal-append-to-body="falseValue"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportDialog2"
+      :modal="falseValue"
+      custom-class="dialog-style"
+      width="501px"
+      height="250px"
+      :beforeClose="handleBeforeClose"
+      @close="handleClose2"
+      v-el-drag-dialog
+    >
+      <div>
+        <div class="import-box">
+          <div class="tips">
+            {{ $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
+            <!-- <span class="fr">耗时：<em class="time-txt">0 时 0 分 0 秒 </em></span> -->
+          </div>
+          <el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
+                       class="export-progress"></el-progress>
+          <div class="i-status">
+            <div class="item">
+              <i class="el-icon-success f-green"></i>
+              {{ $t2('成功', 'components.excelImport.success') }}：
+              <span class="successNum" @click="showSuccessResult">{{ totalSuccessNum }}</span>
+            </div>
+            <div class="item">
+              <i class="el-icon-error f-red"></i>
+              {{ $t2('失败', 'components.excelImport.fail') }}：
+              <span class="failNum" @click="showErrorResult">{{ totalErrorNum }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" center="true">
+        <div class="fl import-count">
+          <span class="f-red doneNum">0</span>
+          /
+          <span class="dataSize">0</span>
+        </div>
+        <el-button type="primary" plain class="button-sty" @click="dialogClose2">
+          <i class="el-icon-close el-icon"></i>
+          {{ $t2('取 消', 'system.button.cancel2') }}
+        </el-button>
+        <el-button type="primary" class="button-sty" @click="dialogPrimary2">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t2('确 定', 'system.button.confirm2') }}
+        </el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :title="$t2('结果', 'components.excelImport.resultTitle')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportResult"
+      :modal="falseValue"
+      custom-class="dialog-style list-dialog"
+      width="1200px"
+      v-el-drag-dialog
+    >
+      <div>
+        <div class="box-style">
+          <div class="cont">
+            <div class="table-div">
+              <vxe-grid
+                id="resGrid"
+                ref="resGrid"
+                height="440px"
+                v-bind="resOption"
+                @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                @custom="$vxeTableUtil.customHandle"
+              >
+                <template #form>
+                  <div class="clearfix screen-btns">
+                    <div class="fl">
+                      <vxe-button status="primary" class="button-sty" icon="el-icon-upload2" @click="exportToExcel()">
+                        {{ $t1('导出') }}
+                      </vxe-button>
+                    </div>
+                    <div class="fr"></div>
+                  </div>
+                </template>
+              </vxe-grid>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {mixins} from './mixins';
+
+export default {
+  mixins: [mixins]
+};
+</script>

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

@@ -1,5 +1,20 @@
 <template>
-  <div class="pop-box" :style="'z-index:'+zIndex">
+  <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
+       里面的 h5SearchDialog（.pop-screen-box）跟着一起进了 body：它自己是
+       position:fixed + z-index:99，在 wrapper 这个层叠上下文内部照样盖住本弹层，
+       样式同样要走顶层选择器，见 xform/styles/h5.scss。 -->
+  <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>
@@ -65,7 +80,7 @@
         </el-form>
       </h5SearchDialog>
     </div>
-  </div>
+  </el-dialog>
 </template>
 
 <script>
@@ -75,6 +90,11 @@ import mixin from './mixins/addTaskUserdialogMixin';
 export default {
   name: 'userDialog',
   props: ['visiable', 'multi', 'rows', 'param'],
-  mixins: [selectDialogMixins, mixin]
+  mixins: [selectDialogMixins, mixin],
+  data() {
+    return {
+      dialogVisible: true
+    };
+  }
 };
 </script>