@newview/ui 1.2.2 → 1.2.3

package/README.md

@@ -1,10 +1,5 @@
-### 1.2.2
-1、form表单构建选择组件添加单位工程
-
-
-### 1.2.1
-1、表格组件工具栏、工具栏组件增加按钮权限控制
-
+### 1.2.3
+1、表格筛选条件刷新优化
 
 ### 1.2.0
 1、表格组件工具栏、工具栏组件增加按钮权限控制

package/dist/newview-ui.js

@@ -32679,7 +32679,7 @@ const GridCellContent$1 = defineComponent({
   render() {
     var _a;
     if (utilities.isNull(this.$props.column.format)) {
-      if (this.$props.column.colType === "date") {
+      if (this.$props.column.colType === "date" && this.$props.row[this.$props.column.field]) {
         if ((_a = this.$props.column.datePicker) == null ? void 0 : _a.format) {
           return utilities.format(new Date(this.$props.row[this.$props.column.field]), this.$props.column.datePicker.format);
         }
@@ -58657,12 +58657,13 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         this.queryWrapper.value = _queryWrapper;
         this.defaultqueryWrapper = this.utilities.deepCopy(_queryWrapper.getQuerys());
         this.loadData(async (options2) => {
-          const apiResult = options2.isPagination ? await this.props.option.api.getEntitiesPageDynamic(options2.page, options2.pageSize, _queryWrapper) : await this.props.option.api.getEntitiesDynamic(_queryWrapper);
+          const apiResult = options2.isPagination ? await this.props.option.api.getEntitiesPageDynamic(options2.page, options2.pageSize, this.queryWrapper.value) : await this.props.option.api.getEntitiesDynamic(this.queryWrapper.value);
           const result = this.utilities.parseApiResult(apiResult);
           options2.success(result);
         });
       }
     });
+    __publicField2(this, "headerFilterParam", {});
     /**
      * 加载表头筛选数据--组件自带默认方法
      * @param _queryWrapper 
@@ -58671,6 +58672,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
       if (this.utilities.isNull(this.props.option.api)) {
         this.message.error("未绑定Api");
       } else {
+        this.headerFilterParam = filterParam;
         let _queryWrapper = this.loadHeaderFilter(filterParam);
         this.loadDataByHeaderFilter(_queryWrapper);
       }
@@ -58731,6 +58733,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
      * @param _queryWrapper 
      */
     __publicField2(this, "loadDataByHeaderFilter", async (_queryWrapper) => {
+      this.queryWrapper.value = _queryWrapper;
       let options2 = this.getLoadDataOptions();
       this.loadDataing.value = true;
       const apiResult = options2.isPagination ? await this.props.option.api.getEntitiesPageDynamic(options2.page, options2.pageSize, _queryWrapper) : await this.props.option.api.getEntitiesDynamic(_queryWrapper);
@@ -58743,7 +58746,13 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
      */
     __publicField2(this, "refreshData", async () => {
       const $table = this.xTable.value;
+      $table.clearFilter();
       if (!this.utilities.isNull(this.readFunction)) {
+        let _queryWrapper = QueryWrapper.create();
+        if (this.defaultqueryWrapper) {
+          _queryWrapper.querys = this.utilities.deepCopy(this.defaultqueryWrapper);
+        }
+        this.queryWrapper.value = _queryWrapper;
         this.loadDataing.value = true;
         await this.readFunction(this.getLoadDataOptions());
         this.loadDataing.value = false;
@@ -58753,7 +58762,6 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         }
         $table.reloadData(this.datas.value);
       }
-      $table.clearFilter();
     });
     /**
      * 页码改变
@@ -241254,12 +241262,13 @@ class GridInstance extends BaseInstance {
         this.queryWrapper.value = _queryWrapper;
         this.defaultqueryWrapper = this.utilities.deepCopy(_queryWrapper.getQuerys());
         this.loadData(async (options2) => {
-          const apiResult = options2.isPagination ? await this.props.option.api.getEntitiesPageDynamic(options2.page, options2.pageSize, _queryWrapper) : await this.props.option.api.getEntitiesDynamic(_queryWrapper);
+          const apiResult = options2.isPagination ? await this.props.option.api.getEntitiesPageDynamic(options2.page, options2.pageSize, this.queryWrapper.value) : await this.props.option.api.getEntitiesDynamic(this.queryWrapper.value);
           const result = this.utilities.parseApiResult(apiResult);
           options2.success(result);
         });
       }
     });
+    __publicField2(this, "headerFilterParam", {});
     /**
      * 加载表头筛选数据--组件自带默认方法
      * @param _queryWrapper 
@@ -241268,6 +241277,7 @@ class GridInstance extends BaseInstance {
       if (this.utilities.isNull(this.props.option.api)) {
         this.message.error("未绑定Api");
       } else {
+        this.headerFilterParam = filterParam;
         let _queryWrapper = this.loadHeaderFilter(filterParam);
         this.loadDataByHeaderFilter(_queryWrapper);
       }
@@ -241328,6 +241338,7 @@ class GridInstance extends BaseInstance {
      * @param _queryWrapper 
      */
     __publicField2(this, "loadDataByHeaderFilter", async (_queryWrapper) => {
+      this.queryWrapper.value = _queryWrapper;
       let options2 = this.getLoadDataOptions();
       this.loadDataing.value = true;
       const apiResult = options2.isPagination ? await this.props.option.api.getEntitiesPageDynamic(options2.page, options2.pageSize, _queryWrapper) : await this.props.option.api.getEntitiesDynamic(_queryWrapper);
@@ -241340,7 +241351,13 @@ class GridInstance extends BaseInstance {
      */
     __publicField2(this, "refreshData", async () => {
       const $table = this.xTable.value;
+      $table.clearFilter();
       if (!this.utilities.isNull(this.readFunction)) {
+        let _queryWrapper = QueryWrapper.create();
+        if (this.defaultqueryWrapper) {
+          _queryWrapper.querys = this.utilities.deepCopy(this.defaultqueryWrapper);
+        }
+        this.queryWrapper.value = _queryWrapper;
         this.loadDataing.value = true;
         await this.readFunction(this.getLoadDataOptions());
         this.loadDataing.value = false;
@@ -241350,7 +241367,6 @@ class GridInstance extends BaseInstance {
         }
         $table.reloadData(this.datas.value);
       }
-      $table.clearFilter();
     });
     /**
      * 页码改变