cloud-web-corejs 1.0.285 → 1.0.286

package/package.json

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

package/src/components/table/index.js

@@ -97,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) {
@@ -1252,7 +1252,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/xform/form-designer/form-widget/container-widget/data-table-widget.vue

@@ -212,6 +212,7 @@ export default {
   },
   created() {
     if(this.widget.options.isNotQueryAllPage===undefined)this.widget.options.isNotQueryAllPage = false;
+    if(this.widget.options.isNotReadQueryAllPage===undefined)this.widget.options.isNotReadQueryAllPage = false;
   }
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -62,6 +62,9 @@
     <el-form-item label="是否查询总页数">
       <el-switch v-model="isQueryAllPage"></el-switch>
     </el-form-item>
+    <el-form-item label="是否读取总页数记忆">
+      <el-switch v-model="isReadQueryAllPage"></el-switch>
+    </el-form-item>
     <el-form-item label="默认每页查询数" class="form-item-label-top">
       <base-input-number
         v-model="optionModel.gridPageSize"
@@ -741,6 +744,14 @@ export default {
         this.optionModel.isNotQueryAllPage = !val;
       },
     },
+    isReadQueryAllPage: {
+      get() {
+        return !this.optionModel.isNotReadQueryAllPage;
+      },
+      set(val) {
+        this.optionModel.isNotReadQueryAllPage = !val;
+      },
+    },
     isShowQueryButton: {
       get() {
         return !this.optionModel.isNotShowQueryButton;
@@ -1107,15 +1118,15 @@ export default {
 </style>
 
 <style scoped>
-.form-section-label {
-  margin: 16px 0 8px;
-  padding-left: 8px;
-  color: rgba(0, 0, 0, 0.65);
-  font-size: 13px;
-  font-weight: 600;
-  line-height: 1.3;
-  background: rgba(0, 0, 0, 0.04);
-  padding: 4px 0 4px 8px;
+.form-section-label {
+  margin: 16px 0 8px;
+  padding-left: 8px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.3;
+  background: rgba(0, 0, 0, 0.04);
+  padding: 4px 0 4px 8px;
 }
 
 .label-tip-icon {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -329,6 +329,7 @@ export const containers = [
       showRules: [],
       hideGridCheckBox: false,
       isNotQueryAllPage: false,
+      isNotReadQueryAllPage: false,
       isNotShowQueryButton: false,
 
       exportItemColumns: [],

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -2686,6 +2686,7 @@ modules = {
         columns: columns,
         searchColumns: searchColumns,
         isQueryAllPage,
+        readQueryAllPage: !this.widget.options.isNotReadQueryAllPage,
         exportItemConfig,
         vform: true,
         ...(this.getDynamicColumnSourceType() !== "none"