cloud-web-corejs 1.0.54-dev.9 → 1.0.54-dev.91

package/src/components/tempStorage/tempStorageDialog.vue

@@ -57,7 +57,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a
+      <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">
@@ -67,7 +67,7 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</span>
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
 			<el-button type="primary" plain class="button-sty" @click="dialogClose">
 				<i class="el-icon-close el-icon"></i>
 				取 消

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -87,6 +87,7 @@ export default {
         fullscreen: this.option.fullscreen,
       };
       config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {

package/src/components/xform/form-designer/form-widget/dialog/formDrawer.vue

@@ -81,6 +81,7 @@ export default {
         direction:"btt"
       };
       config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {

package/src/components/xform/form-designer/form-widget/dialog/formFieldDialog.vue

@@ -55,7 +55,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a class="allDel icon-quanbushanchu"
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a class="allDel icon-quanbushanchu"
                                                                                      @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
@@ -66,7 +66,7 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</span>
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
 			<el-button type="primary" plain class="button-sty" @click="dialogClose">
 				<i class="el-icon-close el-icon"></i>
 				{{ $t2('取 消', 'system.button.cancel2') }}

package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue

@@ -2,7 +2,7 @@
   <div v-if="showContent">
     <el-dialog
       :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
+      :append-to-body="true"
       :modal-append-to-body="falseValue"
       :close-on-click-modal="falseValue"
       :visible.sync="showImportDialog"
@@ -41,6 +41,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
+        <span class="fl tips">{{ $t1('注：导入文件不允许超过{fileSize}MB', {fileSize: importFileLimitSize}) }}</span>
 				<el-button type="primary" plain class="button-sty" @click="dialogClose1">
 					<i class="el-icon-close el-icon"></i>
 					{{ $t2('取 消', 'system.button.cancel2') }}
@@ -54,7 +55,7 @@
     <el-dialog
       ref="importDialog"
       :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
+      :append-to-body="true"
       :modal-append-to-body="falseValue"
       :close-on-click-modal="falseValue"
       :visible.sync="showImportDialog2"
@@ -66,7 +67,28 @@
       v-el-drag-dialog
     >
       <div>
-        <div class="import-box">
+        <div v-show="importLoading" class="import-stepbox">
+          <ul>
+            <li :class="getLoadingClass(1,percent1)">
+              <i class="el-icon-circle-check"></i>
+              <i class="el-icon-loading"></i>
+              <span v-html="$t1('上传导入文件  {percent}', {percent: `<span class=nums>${percent1}%</span>`})"></span>
+            </li>
+            <li :class="getLoadingClass(2,percent2)">
+              <i class="el-icon-circle-check"></i>
+              <i class="el-icon-loading"></i>
+              <span
+                v-html="$t1('校验导入文件中的图片数据格式  {percent}', {percent: `<span class=nums>${percent2}%</span>`})"></span>
+            </li>
+            <li :class="getLoadingClass(3,percent3)">
+              <i class="el-icon-circle-check"></i>
+              <i class="el-icon-loading"></i>
+              <span
+                v-html="$t1('存储导入文件中的图片  {percent}', {percent: `<span class=nums>${percent3}%</span>`})"></span>
+            </li>
+          </ul>
+        </div>
+        <div v-show="!importLoading" class="import-box" style="margin-bottom: 30px;">
           <div class="tips">
             {{ $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
             <!-- <span class="fr">耗时：<em class="time-txt">0 时 0 分 0 秒 </em></span> -->
@@ -88,7 +110,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" center="true">
-        <div class="fl import-count">
+        <div class="fl import-count" v-show="!importLoading">
           <span class="f-red doneNum">0</span>
           /
           <span class="dataSize">0</span>
@@ -130,12 +152,20 @@
                   <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>
+                <template #attachment="{row,column}">
+                  <base-attachment :option="{
+                      title: column.title,
+                      rows: row[column.field],
+                      showViewButton: true,
+                      edit:false
+                    }"/>
+                </template>
               </vxe-grid>
             </div>
           </div>