cloud-web-corejs 1.0.218 → 1.0.220

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.218",
+  "version": "1.0.220",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/baseAlert/index.vue

@@ -11,7 +11,7 @@
       @close="closeDialog"
     >
       <div class="cont" ref="cont">
-        {{ content }}
+        <p v-html="content"></p>
       </div>
       <span slot="footer" class="dialog-footer">
         <input

package/src/components/excelExport/button.vue

@@ -1,65 +1,79 @@
 <template>
-  <el-dropdown trigger="hover" :disabled="showIndexViewDialog">
+  <el-dropdown trigger="hover">
     <el-button type="primary" class="button-sty" size="mini">
-      <span>{{ $t2('列表导出', 'components.excelExport.listExport') }}</span><span class="line"></span> <i
-      class="el-icon-arrow-down el-icon--right"></i>
+      <span>{{ $t2("列表导出", "components.excelExport.listExport") }}</span
+      ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
     </el-button>
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item icon="el-icon-upload2"
-                        @click.native="toDo()"
-                        v-if="option.conditionExport!==false">
-        {{ $t2('条件导出', 'components.excelExport.conditionExport') }}
+      <el-dropdown-item
+        icon="el-icon-upload2"
+        @click.native="toDo()"
+        v-if="option.conditionExport !== false"
+      >
+        {{ $t2("条件导出", "components.excelExport.conditionExport") }}
       </el-dropdown-item>
-      <el-dropdown-item icon="el-icon-upload2"
-                        @click.native="toDo('selected')"
-                        v-if="option.selectExport!==false">
-        {{ $t2('选择导出', 'components.excelExport.selectExport') }}
+      <el-dropdown-item
+        icon="el-icon-upload2"
+        @click.native="toDo('selected')"
+        v-if="option.selectExport !== false"
+      >
+        {{ $t2("选择导出", "components.excelExport.selectExport") }}
       </el-dropdown-item>
-      <el-dropdown-item icon="el-icon-upload2"
-                        @click.native="toDo('current')"
-                        v-if="option.currentExport===true">
-        {{ $t2('当前页导出', 'components.excelExport.currentExport') }}
+      <el-dropdown-item
+        icon="el-icon-upload2"
+        @click.native="toDo('current')"
+        v-if="option.currentExport === true"
+      >
+        {{ $t2("当前页导出", "components.excelExport.currentExport") }}
       </el-dropdown-item>
     </el-dropdown-menu>
 
-    <indexViewDialog ref="indexViewDialogRef" v-if="showIndexViewDialog" :visiabled.sync="showIndexViewDialog" :param="indexViewOption"></indexViewDialog>
+    <indexViewDialog
+      ref="indexViewDialogRef"
+      v-if="showIndexViewDialog"
+      :visiabled.sync="showIndexViewDialog"
+      :param="indexViewOption"
+    ></indexViewDialog>
   </el-dropdown>
 </template>
 
 <script>
 import indexViewDialog from "./index.vue";
 
-
 export default {
   name: "base-table-export",
   props: {
-    option: Object
+    option: Object,
   },
-  components:{
-    indexViewDialog
+  components: {
+    indexViewDialog,
   },
-  data(){
+  data() {
     return {
-      showExportFieldOptions:null,
-      showExportFieldDialog:false,
-      indexViewOption:null,
-      showIndexViewDialog:false
-    }
+      showExportFieldOptions: null,
+      showExportFieldDialog: false,
+      indexViewOption: null,
+      showIndexViewDialog: false,
+    };
   },
   methods: {
     toDo(type) {
-      let that = this.$attrs['parent-target'];
-      let option = {...this.option, type: type, vue:that,destroyComponent:(loadingObj)=>{
+      let that = this.$attrs["parent-target"];
+      let option = {
+        ...this.option,
+        type: type,
+        vue: that,
+        destroyComponent: (loadingObj) => {
           this.showIndexViewDialog = false;
-          if(loadingObj){
-            setTimeout(function (){
-              loadingObj.close()
-            },200)
+          if (loadingObj) {
+            setTimeout(function () {
+              loadingObj.close();
+            }, 200);
           }
-        }};
-
+        },
+      };
 
-/*
+      /*
         // this.option = this.param;
         let $grid = getGrid(option.vue, option.targetRef);
         let datas = [];
@@ -78,21 +92,16 @@ export default {
         }
         */
 
-
       this.indexViewOption = option;
       this.showIndexViewDialog = true;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.indexViewDialogRef.exc();
-      })
+      });
       // that.$excelExport(option);
     },
-    openIndexViewDialog(option){
-
-    },
-  }
-}
+    openIndexViewDialog(option) {},
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/excelExport/exportFieldDialog.vue

@@ -186,7 +186,7 @@ export default {
       } else {
         //导出子表数据
         let exportItemColumns = target.exportItemColumns || [];
-        let originOption = target.originOption;
+        let originOption = target.params.originOption;
         let oriExportItemColumns = originOption.exportItemConfig?.columns || [];
 
         this.loopColumnHandle(oriExportItemColumns, (item) => {
@@ -223,7 +223,7 @@ export default {
       let exportItem = this.param.type === "exportItem";
 
       let $grid = this.getGrid();
-      let originOption = $grid.originOption;
+      let originOption = $grid.params.originOption;
       let leafColumns = this.$refs.tree.getCheckedNodes(true);
       let checkLeafIds = leafColumns.map((item) => item.id);
 
@@ -277,7 +277,7 @@ export default {
     },
     dialogConfirm() {
       let target = this.getGrid();
-      let originOption = target.originOption;
+      let originOption = target.params.originOption;
       let leafColumns = this.$refs.tree.getCheckedNodes(true);
       let checkIds = this.$refs.tree.getCheckedNodes(false, true).map((item) => item.id);
       let exportItem = this.param.type == "exportItem";

package/src/components/excelExport/index.vue

@@ -1,11 +1,26 @@
 <template>
   <div class="inner-dialog">
     <span v-if="isMinimize" class="export-box-small">
-      <a href="javascript:void(0)" @click="handleMinimize"><p>列表导出<i class="el-icon-zoom-in"></i></p>
-      <el-progress  :percentage="percentageNum" :show-text="false" :stroke-width="3" status="success"></el-progress></a>
+      <a href="javascript:void(0)" @click="handleMinimize"
+        ><p>
+          {{ $t2("列表导出", "components.excelExport.listExport")
+          }}<i class="el-icon-zoom-in"></i>
+        </p>
+        <el-progress
+          :percentage="percentageNum"
+          :show-text="false"
+          :stroke-width="3"
+          status="success"
+        ></el-progress
+      ></a>
     </span>
-    <exportFieldDialog :visiable.sync="showExportFieldDialog" v-if="showExportFieldDialog" :param="param" @close="closeExportFieldDialog"
-                       @confirm="confirmExportFieldDialog"></exportFieldDialog>
+    <exportFieldDialog
+      :visiable.sync="showExportFieldDialog"
+      v-if="showExportFieldDialog"
+      :param="param"
+      @close="closeExportFieldDialog"
+      @confirm="confirmExportFieldDialog"
+    ></exportFieldDialog>
     <el-dialog
       ref="exportDialog"
       :title="title"
@@ -18,49 +33,55 @@
       :modal-append-to-body="false"
       @close="dialogClose2"
     >
-     <!-- <el-button class="isFullIcon" @click="handleMinimize">
+      <!-- <el-button class="isFullIcon" @click="handleMinimize">
         <el-tooltip effect="dark" content="缩小" placement="top">
           <i class="el-icon-minus"></i>
         </el-tooltip>
       </el-button> -->
       <div class="export-box">
-        <div class="tips">{{ $t2('导出中，请勿关闭当前窗口', 'components.excelExport.tip') }}</div>
-        <el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
-                     class="export-progress"></el-progress>
+        <div class="tips">
+          {{ $t2("导出中，请勿关闭当前窗口", "components.excelExport.tip") }}
+        </div>
+        <el-progress
+          :text-inside="true"
+          :stroke-width="26"
+          :percentage="percentageNum"
+          class="export-progress"
+        ></el-progress>
         <vxe-grid ref="exportTable" v-bind="exportGrid">
-          <template #row_edit="{row}">
+          <template #row_edit="{ row }">
             <a href="javascript:void(0);" class="a-link" @click="exportAll(row)">
-              <i class="el-icon-download"/>
-              {{ $t2('下载', 'system.button.download') }}
+              <i class="el-icon-download" />
+              {{ $t2("下载", "system.button.download") }}
             </a>
           </template>
         </vxe-grid>
       </div>
       <span slot="footer" class="dialog-footer">
-				<div class="fl import-count">
-					<span class="f-red doneNum">{{ doneSize }}</span>
-					/
-					<span class="dataSize">{{tTotalSize}}</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" @click="dialogClose2" class="button-sty">
-					<i class="el-icon-check el-icon"></i>
-					{{ $t2('确 定', 'system.button.confirm2') }}
-				</el-button>
-			</span>
+        <div class="fl import-count">
+          <span class="f-red doneNum">{{ doneSize }}</span>
+          /
+          <span class="dataSize">{{ tTotalSize }}</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" @click="dialogClose2" class="button-sty">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t2("确 定", "system.button.confirm2") }}
+        </el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {mixins} from './mixins';
+import { mixins } from "./mixins";
 
 export default {
-  name: 'excelExport2',
-  mixins: [mixins]
+  name: "excelExport2",
+  mixins: [mixins],
 };
 </script>
 
@@ -84,13 +105,13 @@ export default {
     padding: 0;
   }
 }
-.export-box-small{
+.export-box-small {
   position: absolute;
   left: 0;
   top: 0;
   width: 93px;
   line-height: 23px;
-  height:26px;
+  height: 26px;
   font-size: 12px;
   color: #fff;
   white-space: nowrap;
@@ -100,13 +121,20 @@ export default {
   border-radius: 2px;
   background: #2a6494;
   text-align: center;
-  .el-progress{position: absolute;bottom:-2.5px;left:0;right:0;}
-  p{margin:0;}
-  i{
+  .el-progress {
+    position: absolute;
+    bottom: -2.5px;
+    left: 0;
+    right: 0;
+  }
+  p {
+    margin: 0;
+  }
+  i {
     vertical-align: middle;
     margin-left: 8px;
     font-size: 14px;
-    color: #FFF;
+    color: #fff;
   }
 }
 </style>