@newview/ui 1.2.2 → 1.2.4

package/README.md

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

package/dist/newview-ui.js

@@ -31459,7 +31459,7 @@ let ComFormInstance$1 = class ComFormInstance2 extends BaseInstance {
   }
   //#endregion 公开Api End
 };
-const ComForm_vue_vue_type_style_index_0_scoped_c4eed153_lang = "";
+const ComForm_vue_vue_type_style_index_0_scoped_80b78296_lang = "";
 const _hoisted_1$j = { class: "comForm" };
 const _hoisted_2$g = ["onClick"];
 const _hoisted_3$d = { key: 1 };
@@ -31603,6 +31603,7 @@ function _sfc_render$p(_ctx, _cache, $props, $setup, $data, $options) {
                         key: 3,
                         modelValue: _ctx.formModel[item2.model],
                         "onUpdate:modelValue": ($event) => _ctx.formModel[item2.model] = $event,
+                        title: _ctx.formModel[item2.model],
                         type: _ctx.getPropValue(item2.inputProp, "type"),
                         size: _ctx.getPropValue(item2.inputProp, "size"),
                         placeholder: _ctx.getPropValue(item2.inputProp, "placeholder"),
@@ -31654,7 +31655,7 @@ function _sfc_render$p(_ctx, _cache, $props, $setup, $data, $options) {
                           ]),
                           key: "1"
                         } : void 0
-                      ]), 1032, ["modelValue", "onUpdate:modelValue", "type", "size", "placeholder", "clearable", "border", "disabled", "readonly", "maxlength", "show-word-limit", "password", "icon", "prefix", "suffix", "search", "enter-button", "rows", "autosize", "number", "autofocus", "autocomplete", "element-id", "spellcheck", "wrap", "onOnEnter", "onOnClick", "onOnChange", "onOnFocus", "onOnBlur", "onOnKeyup", "onOnKeydown", "onOnKeypress", "onOnSearch", "onOnClear"])) : createCommentVNode("", true),
+                      ]), 1032, ["modelValue", "onUpdate:modelValue", "title", "type", "size", "placeholder", "clearable", "border", "disabled", "readonly", "maxlength", "show-word-limit", "password", "icon", "prefix", "suffix", "search", "enter-button", "rows", "autosize", "number", "autofocus", "autocomplete", "element-id", "spellcheck", "wrap", "onOnEnter", "onOnClick", "onOnChange", "onOnFocus", "onOnBlur", "onOnKeyup", "onOnKeydown", "onOnKeypress", "onOnSearch", "onOnClear"])) : createCommentVNode("", true),
                       item2.type == "InputNumber" ? (openBlock(), createElementBlock("div", {
                         key: 4,
                         class: normalizeClass(["ivu-input-group ivu-input-wrapper", { "ivu-input-group-with-append": _ctx.getAppend(item2.inputNumberProp) != "" }])
@@ -32047,7 +32048,7 @@ function _sfc_render$p(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ]);
 }
-const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$p], ["__scopeId", "data-v-c4eed153"]]);
+const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$p], ["__scopeId", "data-v-80b78296"]]);
 const style = "";
 const propDefine$v = {
   options: {
@@ -32679,7 +32680,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 +58658,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 +58673,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 +58734,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 +58747,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 +58763,6 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         }
         $table.reloadData(this.datas.value);
       }
-      $table.clearFilter();
     });
     /**
      * 页码改变
@@ -241254,12 +241263,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 +241278,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 +241339,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 +241352,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 +241368,6 @@ class GridInstance extends BaseInstance {
         }
         $table.reloadData(this.datas.value);
       }
-      $table.clearFilter();
     });
     /**
      * 页码改变