centaline-data-driven 1.3.30 → 1.3.33

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -1,80 +1,33 @@
 <template>
-  <div
-    style="width: 100%"
-    class="ct-searchtable"
-    ref="searchTable"
-    :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }"
-  >
-    <ct-tableStats
-      ref="tableStats"
-      class="ct-search-table-list-header"
-      v-if="!isLoading && searchStatsApi"
-      :api="searchStatsApi"
-      @searchStats="searchStats"
-      @setTableHeight="setTableHeight"
-      :searchModel="model.searchModel"
-    ></ct-tableStats>
-    <ct-tabletoolbar
-      ref="toolbar"
-      v-if="!isLoading"
+  <div  style="width: 100%" class="ct-searchtable" ref="searchTable" :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }">
+    <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
+      v-if="!isLoading && searchStatsApi" :api="searchStatsApi"
+      @searchStats="searchStats"  @setTableHeight="setTableHeight" :searchModel="model.searchModel">
+    </ct-tableStats>
+
+    <ct-tabletoolbar ref="toolbar" v-if="!isLoading"
       :buttons="model.buttons"
-      @click="toolbarClickHandler($event)"
-      @importComplete="importComplete"
-      :optionApi="model.optionApi"
-      :searchModel="model.searchModel"
-    ></ct-tabletoolbar>
-    <ct-tabletip
-      ref="listHeader"
-      class="ct-search-table-list-header"
-      :tip="model.listHeader"
-      v-if="!isLoading"
-    ></ct-tabletip>
-    <div
-      v-loading="tableLoading"
-      v-if="!isLoading"
-      :style="{ height: '0px', top: model.tableHeight * 0.55 + 'px' }"
-    ></div>
+      @click="toolbarClickHandler($event)" @importComplete="importComplete"
+      :optionApi="model.optionApi" :searchModel="model.searchModel">
+    </ct-tabletoolbar>
+
+    <ct-tabletip ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader" v-if="!isLoading"></ct-tabletip>
+
+    <div v-loading="tableLoading" v-if="!isLoading" :style="{ height: '0px', top: model.tableHeight * 0.55 + 'px' }"></div>
     <div v-loading="operationLoading"></div>
-    <div
-      class="ct-tableParent"
-      ref="tableParent"
-      v-bind="model.attrs"
-      v-if="!isLoading"
-      :style="{
-        height: from == 'form' ? '100%' : model.tableHeight + 'px',
-        'border-bottom': isLayout ? 'none' : '',
-        'border-top': isLayout ? 'none' : '',
-      }"
-      @scroll="scrollHandle($event)"
-      :v-focus="model.flagFocus"
-      @keydown.up="rowKeyDownHandle($event, 0)"
-      @keydown.down="rowKeyDownHandle($event, 1)"
-      tabindex="-1"
-    >
+
+    <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
+      :style="{ height: from == 'form' ? '100%' : model.tableHeight + 'px','border-bottom': isLayout ? 'none' : '','border-top': isLayout ? 'none' : '',}"
+      @scroll="scrollHandle($event)" :v-focus="model.flagFocus" 
+      @keydown.up="rowKeyDownHandle($event, 0)" @keydown.down="rowKeyDownHandle($event, 1)"
+      tabindex="-1">
       <div class="ct-table-content" v-if="!isLayout">
-        <table
-          border="0"
-          cellpadding="0"
-          cellspacing="0"
-          :class="[
-            'ct-table',
-            model.attrs.size ? 'ct-table-' + model.attrs.size : '',
-          ]"
-        >
+        <table border="0" cellpadding="0" cellspacing="0"
+          :class="['ct-table',model.attrs.size ? 'ct-table-' + model.attrs.size : '',]">
           <!--表头-->
           <thead ref="tableHead" class="right-no-fixation-th">
-            <tr
-              class="ct-tr"
-              ref="headTr"
-              v-for="(columns, columnsIndex) in model.columnsArr"
-              :key="columnsIndex"
-            >
-              <th
-                v-if="model.isMulti && columnsIndex === 0"
-                ref="headLeftThs"
-                class="ct-td left-fixation-th checkbox-td"
-                :class="[model.tdClass]"
-              >
+            <tr class="ct-tr" ref="headTr" v-for="(columns, columnsIndex) in model.columnsArr" :key="columnsIndex">
+              <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
                 <label class="el-checkbox">
                   <span class="el-checkbox__input" :class="model.selectAllType">
                     <span class="el-checkbox__inner"></span>
@@ -88,20 +41,9 @@
                   </span>
                 </label>
               </th>
-              <th
-                :ref="
-                  column.fixed
-                    ? column.fixed === 'left'
-                      ? 'headLeftThs'
-                      : 'headRightThs'
-                    : 'headThs'
-                "
-                v-for="(column, colIndex) in columns"
-                :key="colIndex"
-                v-if="column.show"
-                class="ct-td ct-searchtable-th"
-                :rowspan="column.rowspan"
-                :colspan="column.colspan"
+              <th :ref=" column.fixed ? column.fixed === 'left' ? 'headLeftThs' : 'headRightThs' : 'headThs'"
+                v-for="(column, colIndex) in columns" :key="colIndex" v-if="column.show"
+                class="ct-td ct-searchtable-th" :rowspan="column.rowspan" :colspan="column.colspan"
                 :class="[
                   colHasWidth[colIndex],
                   column.sortAction,
@@ -111,31 +53,14 @@
                   column.fixed === 'left' ? 'left-fixation-th' : null,
                   column.fixed === 'right' ? 'right-fixation-th' : null,
                   column.width === undefined ? 'ct-table-auto' : null,
-                  typeof column.fixed === 'undefined'
-                    ? 'right-no-fixation-th'
-                    : null,
+                  typeof column.fixed === 'undefined' ? 'right-no-fixation-th': null,
                 ]"
-                @mousemove="thMouseMoveHandle($event)"
-                @mousedown="thMouseDownHandle($event, colIndex)"
-                v-bind="column.attrs"
-              >
+                @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event, colIndex)"
+                v-bind="column.attrs">
                 <span>{{ column.name }}</span>
-                <span
-                  class="caret-wrapper"
-                  v-if="column.sort"
-                  @click="toSort($event, column)"
-                  @contextmenu.prevent="clearSort($event, column)"
-                >
-                  <i
-                    class="sort-caret ascending"
-                    @click.left="toSort($event, column, 'asc')"
-                    @contextmenu.prevent="clearSort($event, column)"
-                  ></i>
-                  <i
-                    class="sort-caret descending"
-                    @click.left="toSort($event, column, 'desc')"
-                    @contextmenu.prevent="clearSort($event, column)"
-                  ></i>
+                <span class="caret-wrapper" v-if="column.sort" @click="toSort($event, column)" @contextmenu.prevent="clearSort($event, column)">
+                  <i class="sort-caret ascending" @click.left="toSort($event, column, 'asc')" @contextmenu.prevent="clearSort($event, column)"></i>
+                  <i class="sort-caret descending" @click.left="toSort($event, column, 'desc')" @contextmenu.prevent="clearSort($event, column)"></i>
                 </span>
               </th>
 
@@ -147,49 +72,20 @@
           <!--表体-->
           <tbody>
             <!--可视区域的行数据-->
-            <tr
-              v-for="(row, rowindex) in model.listData"
-              :key="rowindex"
-              v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
-              :ref="'rows.' + rowindex"
-              @click="rowClickHandle($event, rowindex)"
-              class="ct-tr"
-              :style="row.$style"
-            >
-              <td
-                v-if="model.isMulti"
-                class="ct-td tdFiexd left-fixation checkbox-td"
-                :class="[model.tdClass]"
-                align="center"
-              >
-                <label
-                  v-if="!model.rightMulti || row[model.rightMulti] == 1"
-                  class="el-checkbox is-checked"
-                >
+            <tr v-for="(row, rowindex) in model.listData" :key="rowindex" v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
+              :ref="'rows.' + rowindex" @click="rowClickHandle($event, rowindex)"
+              class="ct-tr" :style="row.$style">
+              <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]" align="center">
+                <label v-if="!model.rightMulti || row[model.rightMulti] == 1" class="el-checkbox is-checked">
                   <span class="el-checkbox__input" :class="rowCheckClass(row)">
                     <span class="el-checkbox__inner"></span>
-                    <input
-                      type="checkbox"
-                      v-model="row.$select"
-                      @change="selectOne($event)"
-                      class="el-checkbox__original checkbox-td-1"
-                    />
+                    <input type="checkbox" v-model="row.$select" @change="selectOne($event)" class="el-checkbox__original checkbox-td-1"/>
                   </span>
                 </label>
               </td>
-              <td
-                :ref="
-                  column.fixed
-                    ? column.fixed === 'left'
-                      ? 'headLeftTds'
-                      : 'headRightTds'
-                    : null
-                "
-                v-for="(column, colIndex) in model.dataFieldcolumns"
-                :key="colIndex"
-                v-if="tdShow(column, row)"
-                :rowspan="tdRowspan(column, row)"
-                class="ct-td"
+              <td :ref="column.fixed? column.fixed === 'left' ? 'headLeftTds': 'headRightTds' : null"
+                v-for="(column, colIndex) in model.dataFieldcolumns" :key="colIndex" v-if="tdShow(column, row)"
+                :rowspan="tdRowspan(column, row)" class="ct-td"
                 :class="[
                   colHasWidth[colIndex],
                   model.tdClass,
@@ -199,95 +95,45 @@
                   column.width === undefined ? 'ct-table-auto' : null,
                   column.fixed === 'right' ? 'right-fixation' : null,
                 ]"
-                v-bind="column.attrs"
-              >
+                v-bind="column.attrs">
                 <!--操作列-->
-                <div
-                  v-if="column.id === 'operation'"
-                  class="div_allinline"
-                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
-                >
-                  <ct-tablecurrency
-                    v-for="(router, rowRouterIndex) in getRowRouterShow(row)"
-                    :key="rowRouterIndex"
-                    v-if="!router.rightField || row[router.rightField] == 1"
-                    :isOperationalColumn="true"
-                    :router="router"
-                    :colValue="router.label"
-                    :rowData="row"
-                    @click="rolRouterClickHandler"
-                  >
+                <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'">
+                  <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex"
+                    v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
+                    :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
-                  <el-popover
-                    v-if="getRowRouterDisplay(row).length > 0"
-                    :ref="'popover' + rowindex"
+                  <el-popover v-if="getRowRouterDisplay(row).length > 0" :ref="'popover' + rowindex"
                     :append-to-table="option.appendId ? option.appendId : ''"
-                    class="Stats-popover"
-                    popper-class="el-popover1"
-                    :placement="option.placement ? option.placement : 'left'"
-                    :trigger="option.trigger ? option.trigger : ''"
-                  >
+                    class="Stats-popover" popper-class="el-popover1"
+                    :placement="option.placement ? option.placement : 'left'" :trigger="option.trigger ? option.trigger : ''">
                     <div class="tab-list" style="border-bottom: none">
-                      <ct-tablecurrency
-                        v-for="(router, rowRouterIndex) in getRowRouterDisplay(
-                          row
-                        )"
-                        :key="rowRouterIndex"
-                        v-if="!router.rightField || row[router.rightField] == 1"
-                        :isOperationalColumn="true"
-                        :isShowImg="false"
-                        :rowindex="rowindex"
-                        :router="router"
-                        :colValue="router.label"
-                        :rowData="row"
-                        @click="rolRouterClickHandler"
-                      >
+                      <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterDisplay(row)"
+                        :key="rowRouterIndex" v-if="!router.rightField || row[router.rightField] == 1"
+                        :isOperationalColumn="true" :isShowImg="false" :rowindex="rowindex"
+                        :router="router" :colValue="router.label" :rowData="row"  @click="rolRouterClickHandler">
                       </ct-tablecurrency>
                     </div>
-                    <span
-                      :slot="
-                        getRowRouterDisplay(row).length > 0 ? 'reference' : ''
-                      "
-                      class="icon-more"
-                    ></span>
+                    <span :slot="getRowRouterDisplay(row).length > 0 ? 'reference' : ''" class="icon-more"></span>
                   </el-popover>
                 </div>
 
-                <ct-tablecurrency
-                  v-else-if="column.id === 'voice'"
-                  :isShowVoice="true"
-                  :router="column.router"
-                  :colValue="column.router.label"
-                  :rowData="row"
-                  @click="rolRouterClickHandler"
-                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
-                >
+                <ct-tablecurrency v-else-if="column.id === 'voice'" :isShowVoice="true"
+                  :router="column.router" :colValue="column.router.label"
+                  :rowData="row" @click="rolRouterClickHandler" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'">
                 </ct-tablecurrency>
 
                 <!--可点击的列-->
-                <ct-tablecurrency
-                  v-else-if="column.router"
-                  :align="column.attrs.align"
-                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
-                  :router="column.router"
-                  :colValue="row[column.id]"
-                  :rowData="row"
-                  @click="rolRouterClickHandler"
-                >
+                <ct-tablecurrency v-else-if="column.router"
+                  :align="column.attrs.align" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
+                  :router="column.router" :colValue="row[column.id]" :rowData="row" @click="rolRouterClickHandler">
                 </ct-tablecurrency>
 
                 <!--正常的列-->
-                <div
-                  v-else-if="column.flagHtml"
-                  v-html="row[column.id]"
-                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
-                  :style="column.style ? column.style : ''"
-                ></div>
-                <div
-                  v-else-if="typeof column.template === 'undefined'"
-                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
-                  :style="column.style ? column.style : ''"
-                >
+                <div v-else-if="column.flagHtml" v-html="row[column.id]"
+                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :style="column.style ? column.style : ''">
+                </div>
+                <div v-else-if="typeof column.template === 'undefined'"
+                  :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :style="column.style ? column.style : ''">
                   {{ row[column.id] }}
                 </div>
 
@@ -306,35 +152,16 @@
       </div>
       <div v-else>
         <div v-for="(row, rowindex) in model.listData" :key="rowindex">
-          <ct-layout
-            :ref="'layout' + rowindex"
-            :vmodel="row"
-            :cellLayout="model.cellLayout"
-            :key="tableComplate"
-            :rowindex="rowindex"
-            :actionRouter="model.actionRouter"
-            @click="rolRouterCellClickHandler"
-          ></ct-layout>
+          <ct-layout :ref="'layout' + rowindex" :vmodel="row" :cellLayout="model.cellLayout" :key="tableComplate"
+            :rowindex="rowindex" :actionRouter="model.actionRouter" @click="rolRouterCellClickHandler">
+          </ct-layout>
         </div>
       </div>
     </div>
-    <ct-tabletip
-      ref="listFooter"
-      class="ct-search-table-list-footer"
-      :tip="model.listFooter"
-      v-if="!isLoading && !isLayout"
-    ></ct-tabletip>
-    <ct-tabletip
-      ref="footer"
-      class="ct-search-table-footer"
-      :tip="model.footer"
-      v-if="!isLoading && !isLayout"
-    ></ct-tabletip>
-    <div
-      v-if="isLoading && searchLoading"
-      v-loading="isLoading"
-      style="top: 30px"
-    ></div>
+
+    <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading && !isLayout"></ct-tabletip>
+    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading && !isLayout"></ct-tabletip>
+    <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top: 30px"></div>
   </div>
 </template>
 <script>
@@ -966,12 +793,6 @@ export default {
         submitData["searchFields"] = self.model.searchModel.searchData;
       }
 
-      //如果是导出按钮，则直接交给父组件处理
-      if (field.isExport) {
-        self.$emit("toolbarClick", field, submitData);
-        return;
-      }
-
       this.routerClickHandler(field, submitData, action);
     },
     rolRouterClickHandler(field, rowData, rowindex) {
@@ -1004,43 +825,42 @@ export default {
             if (field.pageStyle) {
               submitData.pageStyle = field.pageStyle;
             }
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTab(
-                action,
-                submitData,
-                field.pageTitle,
-                self.model,
-                field.dialogWidth
-              );
-          } else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+            self.$common.getDataDrivenOpts().handler.openTab(action,submitData,field.pageTitle,self.model,field.dialogWidth);
+          } 
+          else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTabSearch(field, submitData);
-          } else if (field.isBrowserNewTab) {
-            // 浏览器打开
+            self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+          } 
+          else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(action + query, "_blank");
-          } else if (field.isOpenUrlInBrowse) {
-            // 浏览器打开
+          } 
+          else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          } else if (field.isSeeVoice) {
-            //看视频
+          } 
+          else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
-          } else if (field.isBrowseAttachment) {
-            //浏览附件
+          } 
+          else if (field.isBrowseAttachment) {//浏览附件
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
-            submitData.mediaData.forEach((v) => {
-              MediaAlbum[0].medias.push(v);
-            });
-            self.$common.viewerfile(field, MediaAlbum, 0, 0);
-          } else if (field.isUrlInLayer) {
-            //URL页面（弹层）
+            if (field.action) {
+              var callback = function (data) {
+                MediaAlbum[0].medias = data;
+                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              }
+              self.model.getAction(field.action, submitData, callback);
+            }
+            else {
+              submitData.mediaData.forEach((v) => {
+                MediaAlbum[0].medias.push(v);
+              });
+              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+            }
+          } 
+          else if (field.isUrlInLayer) {//URL页面（弹层）
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -1071,10 +891,7 @@ export default {
                     delete() {
                       var res = {};
                       res.notification = 4;
-                      res.content =
-                        self.model.listData[self.model.selectIndex][
-                          self.model.primaryKey
-                        ];
+                      res.content = self.model.listData[self.model.selectIndex][self.model.primaryKey];
                       self.model.doAction(res);
                       self.$common.closeDialog(dialogOption.dialog);
                     },
@@ -1090,7 +907,29 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else {
+          }
+          else if (field.isExport) {
+            if(field.flagAsync){
+              self.model.export(field, submitData);
+            }
+            else{
+              if(field.action.indexOf("http://")===0 || field.action.indexOf("https://")===0){
+                window.open(field.action, "_blank");
+              }
+              else{
+                field.doAction(submitData, (data) => {
+                  if(data.content){
+                    if(data.content.indexOf("http://")===0 || data.content.indexOf("https://")===0){
+                      window.open(data.content, "_blank");
+                    }
+                    else{
+                    }
+                  }
+                });
+              }
+            }
+          }
+          else {
             //self.operationLoading = true;
 
             //Form
@@ -1219,7 +1058,8 @@ export default {
                 ],
               };
               self.$common.openDialog(dialogOption);
-            } else {
+            } 
+            else {
               self.operationLoading = true;
               field.doAction(submitData, (data) => {
                 self.operationLoading = false;
@@ -1243,8 +1083,7 @@ export default {
           // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
           // var fun = self.model.scripts.formData[action];
           // fun(submitData,field);
-          let title =
-            field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[action];
           fun(submitData, title, self.$parent);
@@ -1252,8 +1091,7 @@ export default {
       };
 
       if (field.alert) {
-        self.$common
-          .confirm(field.alertMsg, field.alertCaption, {
+        self.$common.confirm(field.alertMsg, field.alertCaption, {
             confirmButtonText: field.alertOKButtonText,
             cancelButtonText: field.alertCancelButtonText,
             //type: 'warning'
@@ -1263,7 +1101,8 @@ export default {
             clickAcion();
           })
           .catch(() => {});
-      } else {
+      } 
+      else {
         clickAcion();
       }
     },
@@ -1570,8 +1409,40 @@ export default {
         );
       }
     },
-    importComplete(res) {
-      this.model.doAction(res);
+    importComplete(res,field) {
+      var self=this;
+      if(field.flagAsync){
+        if(res.content && res.content.action){
+          var dialogOption = {
+            title: "导入",
+            content: [{
+              component: 'ct-progress',
+              attrs: {
+                progressAction: res.content.action,
+                progressKey: res.content.key,
+                progressType:'import',
+                width: '300px',
+                height: '60px'
+              },
+              on: {
+                finished() {
+                  self.$common.closeDialog(dialogOption.dialog);
+                  self.getPage(1);
+                }
+              }
+            }]
+          };
+          self.$common.openDialog(dialogOption);
+          }
+      }
+      else{
+        if(field && field.changeCallBackFunName){
+          this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+        }
+        else{
+          this.model.doAction(res);
+        }
+      }
     },
     tdRowspan(column, row) {
       if (!column.show) {

package/src/centaline/dynamicSearchList/src/dynamicTableToolbar.vue

@@ -62,8 +62,8 @@ export default {
       }
       return this.searchModel ? this.searchModel.searchData : {};
     },
-    importComplete(res) {
-      this.$emit("importComplete", res);
+    importComplete(res,field) {
+      this.$emit("importComplete", res,field);
     }
   }
 };