cloud-web-corejs 1.0.54-dev.333 → 1.0.54-dev.335

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

@@ -32,7 +32,7 @@
       <el-switch v-model="optionModel.hideGridCheckBox"></el-switch>
     </el-form-item>
     <el-form-item label="是否查询总页数">
-      <el-switch v-model="!optionModel.isNotQueryAllPage"></el-switch>
+      <el-switch v-model="isQueryAllPage"></el-switch>
     </el-form-item>
     <el-form-item label="默认每页查询数">
       <base-input-number v-model="optionModel.gridPageSize" size="mini" :min="1" :max="10000"/>
@@ -731,6 +731,14 @@ export default {
     },
     reportTemplate: function () {
       return this.getReportTemplate();
+    },
+    isQueryAllPage: {
+      get(){
+        return !this.optionModel.isNotQueryAllPage;
+      },
+      set(val){
+        this.optionModel.isNotQueryAllPage = !val;
+      }
     }
   },
   created: function () {

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -29,6 +29,10 @@
     <el-form-item label="执行后台脚本编码">
       <el-input v-model="optionModel.importScriptCode"></el-input>
     </el-form-item>
+    <el-form-item label="批量导入">
+      <el-switch v-model="optionModel.importMultiple"></el-switch>
+    </el-form-item>
+
     <el-form-item label="启用图片处理">
       <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
     </el-form-item>

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

@@ -3043,6 +3043,7 @@ export const advancedFields = [
       ...defaultWfConfig,
       hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
+      importMultiple:false,
       importFileLimitSize: 200,
       importEntity: "",
       importAttachCode: "",

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

@@ -873,6 +873,18 @@ modules = {
         otherConfig.checkBoxRequired = false;
       }
 
+      let gridPageSize = this.widget.options.gridPageSize;
+      let gridPageSizeList = this.widget.options.gridPageSizeList || [];
+      if(!gridPageSizeList || !gridPageSizeList.length){
+        pagerConfig.pageSizes = [50,100,200,500]
+        if(!gridPageSize)gridPageSize = 100
+        pagerConfig.pageSize = gridPageSize
+      }else{
+        pagerConfig.pageSizes = gridPageSizeList.filter(item=>item.value).map(item=>item.value);
+        if(!gridPageSize)gridPageSize = pagerConfig.pageSizes[0]
+        pagerConfig.pageSize = gridPageSize
+      }
+
       //标题颜色
       let headerCellStyle = null;
       let tableColumns = this.widget.options.tableColumns;