@newview/ui 1.1.83 → 1.1.85

package/README.md

@@ -1,6 +1,3 @@
-### 1.1.82
-1、新增类型
-
 ### 1.1.81
 1、select框增加getIsEnableSw优化
 

package/dist/newview-ui.js

@@ -58658,9 +58658,8 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
             }
             break;
           case "daterange":
-            let startDate = this.utilities.format(value[0], "yyyy-MM-DD");
-            let EndDate = this.utilities.format(value[1], "yyyy-MM-DD");
-            _queryWrapper.between(`date_format(${key2},'%Y-%m-%d')`, startDate, EndDate);
+            _queryWrapper.ge(key2, value[0]);
+            _queryWrapper.le(key2, value[1]);
             break;
           case "numberrange":
             if (!this.utilities.isNull(value[0])) {
@@ -61316,6 +61315,10 @@ let GridInstanceJava$1 = class GridInstanceJava2 extends BaseInstance {
      * 表格数据
      */
     __publicField2(this, "datas", ref([]));
+    /**
+     * 表尾数据
+     */
+    __publicField2(this, "footerData", ref([]));
     /**
      * 页码
      */
@@ -61936,6 +61939,39 @@ let GridInstanceJava$1 = class GridInstanceJava2 extends BaseInstance {
     __publicField2(this, "setFilter", (field, options2) => {
       this.xTable.value.setFilter(field, options2);
     });
+    /**
+     * 表尾数据赋值
+     * @param datas 
+     */
+    __publicField2(this, "setFooterData", (datas) => {
+      this.footerData.value = datas;
+    });
+    /**
+     * 临时合并单元格
+     * @param mergeCells 
+     */
+    __publicField2(this, "setMergeCells", (mergeCells) => {
+      var _a;
+      (_a = this.xTable.value) == null ? void 0 : _a.setMergeCells(mergeCells);
+    });
+    /**
+     * 临时合并表尾
+     * @param mergeCells 
+    */
+    __publicField2(this, "setMergeFooterItems", (mergeCells) => {
+      var _a;
+      (_a = this.xTable.value) == null ? void 0 : _a.setMergeFooterItems(mergeCells);
+    });
+    /**
+     * 导出excel
+     * @param exportDatas 导出数据
+     * @param fileName 导出文件名
+     * @param merges 合并单元格配置
+     * @param style 单元格样式
+     */
+    __publicField2(this, "exportExcel", (exportDatas, fileName, merges, style2) => {
+      new ExcelHelper().downloadExcelAndSetStyle(exportDatas, fileName + ".xlsx", merges, style2);
+    });
     this.props = props;
     this.ctx = ctx;
     CreatGridRenderer();
@@ -62058,8 +62094,8 @@ let GridInstanceJava$1 = class GridInstanceJava2 extends BaseInstance {
   }
   //#endregion 公开方法 END
 };
-const GridJava_vue_vue_type_style_index_0_scoped_60a03b77_lang = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-60a03b77"), n = n(), popScopeId(), n);
+const GridJava_vue_vue_type_style_index_0_scoped_3822ca27_lang = "";
+const _withScopeId$2 = (n) => (pushScopeId("data-v-3822ca27"), n = n(), popScopeId(), n);
 const _hoisted_1$a = { class: "nv-crud nv-pos-r" };
 const _hoisted_2$7 = { class: "grid-msg" };
 const _hoisted_3$6 = { class: "nv-crud-body" };
@@ -62201,6 +62237,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
           height: "100%",
           "empty-text": (_a = _ctx.option.setting) == null ? void 0 : _a.emptyText,
           data: _ctx.datas,
+          "footer-data": _ctx.footerData,
           "keep-source": true,
           "column-config": { resizable: true },
           border: _ctx.getBorder(),
@@ -62264,7 +62301,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["columns", "xTable", "onClearRadioRow", "onDelete", "onAddchild"])
           ]),
           _: 1
-        }, 16, ["empty-text", "data", "border", "show-header", "row-class-name", "cell-class-name", "row-config", "edit-config", "tree-config", "edit-rules", "menu-config", "filter-config", "span-method", "checkbox-config", "stripe", "show-overflow", "onKeydownStart", "onKeydown", "onKeydownEnd", "onPaste", "onCopy", "onCut", "onCurrentChange", "onRadioChange", "onCheckboxChange", "onCheckboxAll", "onCheckboxRangeStart", "onCheckboxRangeChange", "onCheckboxRangeEnd", "onCellClick", "onCellDblclick", "onCellMenu", "onCellMouseenter", "onCellMouseleave", "onHeaderCellClick", "onHeaderCellDblclick", "onHeaderCellMenu", "onFooterCellClick", "onFooterCellDblclick", "onFooterCellMenu", "onSortChange", "onFilterChange", "onResizableChange", "onToggleRowExpand", "onToggleTreeExpand", "onMenuClick", "onEditClosed", "onEditActived", "onEditDisabled", "onValidError", "onScroll", "onCustom"]), [
+        }, 16, ["empty-text", "data", "footer-data", "border", "show-header", "row-class-name", "cell-class-name", "row-config", "edit-config", "tree-config", "edit-rules", "menu-config", "filter-config", "span-method", "checkbox-config", "stripe", "show-overflow", "onKeydownStart", "onKeydown", "onKeydownEnd", "onPaste", "onCopy", "onCut", "onCurrentChange", "onRadioChange", "onCheckboxChange", "onCheckboxAll", "onCheckboxRangeStart", "onCheckboxRangeChange", "onCheckboxRangeEnd", "onCellClick", "onCellDblclick", "onCellMenu", "onCellMouseenter", "onCellMouseleave", "onHeaderCellClick", "onHeaderCellDblclick", "onHeaderCellMenu", "onFooterCellClick", "onFooterCellDblclick", "onFooterCellMenu", "onSortChange", "onFilterChange", "onResizableChange", "onToggleRowExpand", "onToggleTreeExpand", "onMenuClick", "onEditClosed", "onEditActived", "onEditDisabled", "onValidError", "onScroll", "onCustom"]), [
           [vShow, _ctx.showTable]
         ])
       ], 512)
@@ -62282,7 +62319,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const GridJava = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-60a03b77"]]);
+const GridJava = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-3822ca27"]]);
 const propDefine$p = {
   width: {
     // Box 宽度
@@ -241130,9 +241167,8 @@ class GridInstance extends BaseInstance {
             }
             break;
           case "daterange":
-            let startDate = this.utilities.format(value[0], "yyyy-MM-DD");
-            let EndDate = this.utilities.format(value[1], "yyyy-MM-DD");
-            _queryWrapper.between(`date_format(${key2},'%Y-%m-%d')`, startDate, EndDate);
+            _queryWrapper.ge(key2, value[0]);
+            _queryWrapper.le(key2, value[1]);
             break;
           case "numberrange":
             if (!this.utilities.isNull(value[0])) {
@@ -242505,6 +242541,10 @@ class GridInstanceJava extends BaseInstance {
      * 表格数据
      */
     __publicField2(this, "datas", ref([]));
+    /**
+     * 表尾数据
+     */
+    __publicField2(this, "footerData", ref([]));
     /**
      * 页码
      */
@@ -243125,6 +243165,39 @@ class GridInstanceJava extends BaseInstance {
     __publicField2(this, "setFilter", (field, options2) => {
       this.xTable.value.setFilter(field, options2);
     });
+    /**
+     * 表尾数据赋值
+     * @param datas 
+     */
+    __publicField2(this, "setFooterData", (datas) => {
+      this.footerData.value = datas;
+    });
+    /**
+     * 临时合并单元格
+     * @param mergeCells 
+     */
+    __publicField2(this, "setMergeCells", (mergeCells) => {
+      var _a;
+      (_a = this.xTable.value) == null ? void 0 : _a.setMergeCells(mergeCells);
+    });
+    /**
+     * 临时合并表尾
+     * @param mergeCells 
+    */
+    __publicField2(this, "setMergeFooterItems", (mergeCells) => {
+      var _a;
+      (_a = this.xTable.value) == null ? void 0 : _a.setMergeFooterItems(mergeCells);
+    });
+    /**
+     * 导出excel
+     * @param exportDatas 导出数据
+     * @param fileName 导出文件名
+     * @param merges 合并单元格配置
+     * @param style 单元格样式
+     */
+    __publicField2(this, "exportExcel", (exportDatas, fileName, merges, style2) => {
+      new ExcelHelper().downloadExcelAndSetStyle(exportDatas, fileName + ".xlsx", merges, style2);
+    });
     this.props = props;
     this.ctx = ctx;
     CreatGridRenderer();