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

package/src/components/obsUpload/mixins.js

@@ -109,8 +109,9 @@ tmixins = {
       Bucket: "gztw-file01", // 你的桶名
     };
   },
-  beforeDestroy() {
-    this.removePasteEvent();
+  beforeDestroy() {
+    this.removePasteEvent();
+    this.revokeUploadObjectUrls();
   },
   filters: {
     btnText(btn) {
@@ -349,7 +350,7 @@ tmixins = {
     blurPasteEvent() {
       this.pasteAreaStatus = false;
     },
-    handleClose() {
+    handleClose() {
       let target = this.$refs.upload;
       (target.uploadFiles || []).forEach((uploadFile) => {
         if (uploadFile.status == "uploading" || uploadFile.status == "ready") {
@@ -358,10 +359,15 @@ tmixins = {
               this.$t2("取消上传", "components.VabUpload.cancelUpload")
             );
         }
-      });
-      this.picture = "picture";
-      this.clearFileInfo();
-      this.dialogFormVisible = false;
+      });
+      this.revokeUploadObjectUrls();
+      this.pasteList = [];
+      this.removePasteEvent();
+      this.picture = "picture";
+      this.clearFileInfo();
+      this.dialogFormVisible = false;
+      const destroyRoot = this.$destroyOnDialogClose;
+      if (destroyRoot) this.$nextTick(destroyRoot);
     },
     clearFileInfo() {
       this.fileList = [];
@@ -1204,15 +1210,33 @@ tmixins = {
       }
     },
     //end
-    getShowImage(file, fileName) {
+    getShowImage(file, fileName) {
       fileName = fileName || file.name;
       if (this.$commonFileUtil.isPictureFile(fileName)) {
         return file.showUrl || file.url;
       } else {
         return this.$commonFileUtil.getFileIconRequire(fileName);
       }
-    },
-    removeFile(sfile) {
+    },
+    revokeUploadObjectUrl(url) {
+      if (typeof url === "string" && url.startsWith("blob:")) {
+        URL.revokeObjectURL(url);
+      }
+    },
+    revokeUploadObjectUrls() {
+      const files = [
+        ...(this.fileList || []),
+        ...(this.pasteList || []),
+        ...(this.$refs.upload?.uploadFiles || []),
+      ];
+      const urls = new Set();
+      files.forEach((file) => {
+        if (file?.showUrl) urls.add(file.showUrl);
+        if (file?.url) urls.add(file.url);
+      });
+      urls.forEach((url) => this.revokeUploadObjectUrl(url));
+    },
+    removeFile(sfile) {
       var target = this.$refs.upload;
       var index;
       var fileList = target.uploadFiles;
@@ -1233,7 +1257,8 @@ tmixins = {
         }
       }
 
-      target.uploadFiles.splice(index, 1);
+      this.revokeUploadObjectUrl(sfile?.showUrl || sfile?.url);
+      target.uploadFiles.splice(index, 1);
       this.handleChange(sfile, target.uploadFiles);
     },
     submitImage() {
@@ -1443,8 +1468,10 @@ tmixins = {
         this.pasteList.push(...fileList);
       }
     },
-    deletePasteFile(index) {
-      this.pasteList.splice(index, 1);
+    deletePasteFile(index) {
+      const file = this.pasteList[index];
+      this.revokeUploadObjectUrl(file?.showUrl || file?.url);
+      this.pasteList.splice(index, 1);
     },
     confirmPasteFile() {
       let target = this.$refs.upload;
@@ -1456,7 +1483,10 @@ tmixins = {
         fileRaw.fileName = name;
         return fileRaw;
       });
-      innerTarget.uploadFiles(files);
+      innerTarget.uploadFiles(files);
+      this.pasteList.forEach((file) =>
+        this.revokeUploadObjectUrl(file?.showUrl || file?.url)
+      );
       this.$nextTick(() => {
         target.uploadFiles.forEach((uploadFile) => {
           let fileRaw = uploadFile.raw;
@@ -1466,7 +1496,7 @@ tmixins = {
           }
         });
       });
-      this.pasteList = [];
+      this.pasteList = [];
     },
     changeFileName(file) {
       if (file.fileSuffix) {

package/src/components/onlineTalk/index.vue

@@ -277,12 +277,12 @@
 
 <script>
 import {mixins} from "./mixins";
-import userDialog from './talkUserDialog.vue';
 
 export default {
   mixins: [mixins],
   components: {
-    userDialog,
+    // 选人弹窗同步引入会把 tableForm 焊进 onlineTalk；仅打开选人时再拉
+    userDialog: () => import('./talkUserDialog.vue'),
     privateProfileDialog: () => import('../../components/VabUpload/privateProfileDialog')
   },
   data() {
@@ -293,7 +293,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import '~@/styles/variables.scss';
+@import '~@base/styles/variables.scss';
 .onlieTalk-search-list{
   list-style: none;margin: -8px -4px 0;padding: 0;min-width: 360px;max-width: 90%;
   .tit{color: #333;font-size: 14px;margin: 10px 0 3px;padding-left: 6px;
@@ -493,7 +493,7 @@ export default {
 
 
 .ico-online {
-  background: url(~@/resources/images/ico-service.png) no-repeat center 19px #FFF;
+  background: url(~@base/core-resources/images/ico-service.png) no-repeat center 19px #FFF;
   background-size: 40px;
   position: fixed;
   right: 28px;

package/src/components/onlineTalk/mixins.js

@@ -92,6 +92,12 @@ tmixins = {
   },
   beforeDestroy() {
     this.clearTimerHandle();
+    (this.files || []).forEach((file) => {
+      const url = file?.showUrl || file?.url;
+      if (typeof url === "string" && url.startsWith("blob:")) {
+        URL.revokeObjectURL(url);
+      }
+    });
   },
   methods: {
     bindMove(e) {
@@ -272,7 +278,7 @@ tmixins = {
         }
       });
     },
-    getUserPage(flag) {
+    getUserPage(flag, silent) {
       if (!this.dialogTableVisible) return
       if (!this.inited) {
         flag = null;
@@ -284,6 +290,7 @@ tmixins = {
         method: `post`,
         data: {operateTime: time},
         modal: false,
+        ...(silent ? { errorMsg: false } : {}),
         success: res => {
           let records = res.objx || [];
           records.forEach(record => {
@@ -368,7 +375,7 @@ tmixins = {
       }
       return lastTalkRecordId;
     },
-    getList(direction, callback) {
+    getList(direction, callback, silent) {
       if (!this.dialogTableVisible) return
       if (!this.talkUserId) return
       let talkUser = this.talkUser;
@@ -387,6 +394,7 @@ tmixins = {
           direction: direction
         },
         modal: false,
+        ...(silent ? { errorMsg: false } : {}),
         success: res => {
           let rows = res.objx || [];
           if (rows.length) {
@@ -456,15 +464,15 @@ tmixins = {
     createTimerHandle() {
       this.clearTimerHandle();
       this.handleExitsRead();
-      this.talkHandle();
+      this.talkHandle(true);
       this.timer = setInterval(() => {
         this.handleExitsRead();
-        this.talkHandle();
+        this.talkHandle(true);
       }, 10000)
     },
-    talkHandle() {
-      this.getUserPage(1);
-      this.getList(0);
+    talkHandle(silent) {
+      this.getUserPage(1, silent);
+      this.getList(0, null, silent);
     },
     clearTimerHandle() {
       if (this.timer) {
@@ -488,6 +496,7 @@ tmixins = {
         method: `post`,
         data: {},
         modal: false,
+        errorMsg: false,
         success: res => {
           this.isExitsRead = res.objx === 1;
         }
@@ -675,6 +684,11 @@ tmixins = {
       })
     },
     deleteFile(index) {
+      const file = this.files[index];
+      const url = file?.showUrl || file?.url;
+      if (typeof url === "string" && url.startsWith("blob:")) {
+        URL.revokeObjectURL(url);
+      }
       this.files.splice(index, 1);
     },
     confirmPrivateProfileDialog(rows) {

package/src/components/table/index.js

@@ -86,6 +86,7 @@ async function initVxeTable(option) {
     isQueryAllPage: true,
     exportColumns: null,
     exportItemColumns: null,
+    exportItemColumnsMap: null,
   };
 
   let isQueryAllPage = true;
@@ -96,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) {
@@ -168,7 +169,8 @@ async function initVxeTable(option) {
   // nOption.getCellValue = getCellValue;
   // nOption.createParams = createParams;
   // nOption.searchColumns = searchColumns;
-  // 运行时可变状态（tableName / isQueryAllPage / exportColumns / exportItemColumns）
+  // 运行时可变状态（tableName / isQueryAllPage / exportColumns / exportItemColumns /
+  // exportItemColumnsMap）
   // 一并放进 params：params 随 vxeOption 由页面持有，grid 被 v-if 销毁重建后依然带着这些值
   let params = {
     originOption,
@@ -329,85 +331,80 @@ function columnDrop(t, tableName, tableRef) {
   }
   let dragStartIndex = -1;
   let dragEndIndex = -1;
-  $table.sortable = configUtil.Sortable.create(
-    headerElem,
-    {
-      handle: ".vxe-header--column:not(.col--fixed)",
-      onMove: (a, b, c) => {
-        let { dragged, related } = a;
-        // dragStartIndex = getElementIndex(dragged);
-        // dragEndIndex = getElementIndex(related);
-
-        let tableColumn = $table.getTableColumn().tableColumn;
-        let draggedColId = dragged.getAttribute("colid");
-        let relatedColId = related.getAttribute("colid");
-        dragStartIndex = tableColumn.findIndex(
-          (item) => item.id === draggedColId
-        );
-        dragEndIndex = tableColumn.findIndex(
-          (item) => item.id === relatedColId
-        );
-      },
-      onEnd: (dropParam) => {
-        let { item } = dropParam;
-        let oldIndex = dragStartIndex;
-        let newIndex = dragEndIndex;
-
-        // Sortable 原地放下时可能不触发 onMove，索引需从 dropParam 兜底
-        if (oldIndex < 0) oldIndex = dropParam.oldIndex;
-        if (newIndex < 0) newIndex = dropParam.newIndex;
-        const { fullColumn, tableColumn, collectColumn } =
-          $table.getTableColumn();
-        const targetThElem = item;
-        const wrapperElem = targetThElem.parentNode;
-        let oldColumn = tableColumn[oldIndex];
-        const newColumn = tableColumn[newIndex];
-        if (!oldColumn || !newColumn) return;
-        if (newColumn.fixed) {
-          // 错误的移动
-          if (newIndex > oldIndex) {
-            wrapperElem.insertBefore(
-              targetThElem,
-              wrapperElem.children[oldIndex]
-            );
-          } else {
-            wrapperElem.insertBefore(
-              wrapperElem.children[oldIndex],
-              targetThElem
-            );
-          }
-          return;
-          /* return that.$XModal.message({
+  $table.sortable = configUtil.Sortable.create(headerElem, {
+    handle: ".vxe-header--column:not(.col--fixed)",
+    onMove: (a, b, c) => {
+      let { dragged, related } = a;
+      // dragStartIndex = getElementIndex(dragged);
+      // dragEndIndex = getElementIndex(related);
+
+      let tableColumn = $table.getTableColumn().tableColumn;
+      let draggedColId = dragged.getAttribute("colid");
+      let relatedColId = related.getAttribute("colid");
+      dragStartIndex = tableColumn.findIndex(
+        (item) => item.id === draggedColId
+      );
+      dragEndIndex = tableColumn.findIndex((item) => item.id === relatedColId);
+    },
+    onEnd: (dropParam) => {
+      let { item } = dropParam;
+      let oldIndex = dragStartIndex;
+      let newIndex = dragEndIndex;
+
+      // Sortable 原地放下时可能不触发 onMove，索引需从 dropParam 兜底
+      if (oldIndex < 0) oldIndex = dropParam.oldIndex;
+      if (newIndex < 0) newIndex = dropParam.newIndex;
+      const { fullColumn, tableColumn, collectColumn } =
+        $table.getTableColumn();
+      const targetThElem = item;
+      const wrapperElem = targetThElem.parentNode;
+      let oldColumn = tableColumn[oldIndex];
+      const newColumn = tableColumn[newIndex];
+      if (!oldColumn || !newColumn) return;
+      if (newColumn.fixed) {
+        // 错误的移动
+        if (newIndex > oldIndex) {
+          wrapperElem.insertBefore(
+            targetThElem,
+            wrapperElem.children[oldIndex]
+          );
+        } else {
+          wrapperElem.insertBefore(
+            wrapperElem.children[oldIndex],
+            targetThElem
+          );
+        }
+        return;
+        /* return that.$XModal.message({
           content: '固定列不允许拖动！',
           status: 'error'
         }) */
-        }
-        // 叶子在 fullColumn 中的下标，与 collectColumn 顶层结构的下标不能直接混用
-        const oldColumnIndex = fullColumn.findIndex(
-          (item) => item.id === oldColumn.id
-        );
-        const newColumnIndex = fullColumn.findIndex(
-          (item) => item.id === newColumn.id
-        );
-        const oldLeafColumn = fullColumn[oldColumnIndex];
-        const newLeafColumn = fullColumn[newColumnIndex];
-        if (oldColumnIndex === newColumnIndex) {
-          return;
-        }
-        const oldTopIdx = collectTopRootIndex(collectColumn, oldLeafColumn);
-        const newTopIdx = collectTopRootIndex(collectColumn, newLeafColumn);
-        if (oldTopIdx === -1 || newTopIdx === -1) {
-          return;
-        }
-        if (oldTopIdx !== newTopIdx) {
-          const currRow = collectColumn.splice(oldTopIdx, 1)[0];
-          collectColumn.splice(newTopIdx, 0, currRow);
-          $table.loadColumn(collectColumn);
-          addTableJson(that, $table, tableName, collectColumn);
-        }
-      },
-    }
-  );
+      }
+      // 叶子在 fullColumn 中的下标，与 collectColumn 顶层结构的下标不能直接混用
+      const oldColumnIndex = fullColumn.findIndex(
+        (item) => item.id === oldColumn.id
+      );
+      const newColumnIndex = fullColumn.findIndex(
+        (item) => item.id === newColumn.id
+      );
+      const oldLeafColumn = fullColumn[oldColumnIndex];
+      const newLeafColumn = fullColumn[newColumnIndex];
+      if (oldColumnIndex === newColumnIndex) {
+        return;
+      }
+      const oldTopIdx = collectTopRootIndex(collectColumn, oldLeafColumn);
+      const newTopIdx = collectTopRootIndex(collectColumn, newLeafColumn);
+      if (oldTopIdx === -1 || newTopIdx === -1) {
+        return;
+      }
+      if (oldTopIdx !== newTopIdx) {
+        const currRow = collectColumn.splice(oldTopIdx, 1)[0];
+        collectColumn.splice(newTopIdx, 0, currRow);
+        $table.loadColumn(collectColumn);
+        addTableJson(that, $table, tableName, collectColumn);
+      }
+    },
+  });
 }
 
 function getSelfConfig() {
@@ -700,9 +697,10 @@ function initOption(opts) {
               let $grid = getGrid(that, opts.tableRef);
               let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
               let pathStr1 = "";
-              if (isQueryAllPage === false) {
+              /* if (isQueryAllPage === false) {
                 queryParams.searchCount = false;
-              }
+              } */
+              queryParams.searchCount = isQueryAllPage !== false;
 
               let reqPath = typeof path === "function" ? path() : path;
               let addUserForTableEnabled =
@@ -888,6 +886,9 @@ function initOption(opts) {
   result = configUtil.extendDeeply(defaultOptions, config);
   applyTableFeatureDisabled(result, that);
 
+  if (!result.pagerConfig) {
+    return result;
+  }
   let pageSize = result.pagerConfig.pageSize;
   let pageSizes = result.pagerConfig.pageSizes;
   if (pageSizes && !pageSizes.includes(pageSize)) {
@@ -978,12 +979,18 @@ function addTableJson(that, $grid, tableName, columns, success) {
   };
   let exportColumns = getTableStateValue($grid, "exportColumns");
   let exportItemColumns = getTableStateValue($grid, "exportItemColumns");
+  // 明细导出的勾选记忆按导出按钮分组（见 excelExport/exportColumnMemory.js）；
+  // exportItemColumns 是分组之前的扁平表，旧记录里还有，只读不再写，故一并原样存回。
+  let exportItemColumnsMap = getTableStateValue($grid, "exportItemColumnsMap");
   if (exportColumns && exportColumns.length) {
     jsonData.exportColumns = exportColumns;
   }
   if (exportItemColumns && exportItemColumns.length) {
     jsonData.exportItemColumns = exportItemColumns;
   }
+  if (exportItemColumnsMap && Object.keys(exportItemColumnsMap).length) {
+    jsonData.exportItemColumnsMap = exportItemColumnsMap;
+  }
   let json = encodeURIComponent(JSON.stringify(jsonData));
 
   let url = USER_PREFIX + "/table_column/addTableJson";
@@ -1081,6 +1088,11 @@ function initExportColumns($grid, tableState, json) {
     tableState.exportItemColumns = json.exportItemColumns;
     setTableState($grid, "exportItemColumns", json.exportItemColumns);
   }
+  let itemMap = json?.exportItemColumnsMap;
+  if (itemMap && Object.keys(itemMap).length) {
+    tableState.exportItemColumnsMap = itemMap;
+    setTableState($grid, "exportItemColumnsMap", itemMap);
+  }
 }
 
 function initSearchColumns(oriColumns, syncColumns) {
@@ -1239,7 +1251,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");
 }
 

package/src/components/table/plugins/cell-area/index.js

@@ -464,8 +464,8 @@ function clearAreaValues($table, area) {
 }
 
 /**
- * 粘贴落盘。必须整段同步执行：业务的 pasteMethod 里会读 window.event.clipboardData
- * 取粘贴进来的图片文件，一旦跨出原生事件派发（setTimeout/await/$nextTick）就读不到了。
+ * 粘贴落盘。必须整段同步执行：clipboardData 会随 clipData 传给业务 pasteMethod，
+ * 一旦跨出原生事件派发（setTimeout/await/$nextTick），部分浏览器就读不到图片文件了。
  */
 function applyPaste($table, pasteCells, clipData) {
   let store = getStore($table);
@@ -499,8 +499,11 @@ function applyPaste($table, pasteCells, clipData) {
       let newRows = insertRows;
       if (clipOpts.createRowsMethod) {
         let created = clipOpts.createRowsMethod({
+          $table: $table,
           insertRows: insertRows,
           pasteCells: pasteCells,
+          startRowIndex: startRowIndex,
+          targetRow: rows[startRowIndex] || null,
         });
         newRows = created || insertRows;
       }
@@ -887,7 +890,11 @@ const cellAreaMixin = {
         pasteCells = [[""]];
       }
       evnt.preventDefault();
-      applyPaste($table, pasteCells, { text: text, html: html });
+      applyPaste($table, pasteCells, {
+        text: text,
+        html: html,
+        clipboardData: clipboardData,
+      });
       if (store.isCut) {
         store.isCut = false;
         store.copyArea = null;