@newview/ui 1.1.0 → 1.1.2

package/dist/newview-ui.js

@@ -8,11 +8,11 @@ import { BaseInstance } from "@newview/base-vue";
 import { openBlock, createElementBlock, normalizeStyle, defineComponent, ref, resolveComponent, createVNode, reactive, watch, onMounted, onUnmounted, createBlock, withCtx, createElementVNode, Fragment, renderList, normalizeClass, withDirectives, createTextVNode, toDisplayString, createCommentVNode, createSlots, vShow, h, computed, nextTick, renderSlot, mergeProps, toHandlers, withModifiers, createApp, getCurrentInstance } from "vue";
 import { VxeColumn, VxeColgroup, VxeGrid, VxeTable } from "vxe-table";
 import { utilities } from "@newview/tools";
+import { Space, Icon, Drawer, Button } from "view-ui-plus";
 import dayjs from "dayjs";
 import JSZip from "jszip";
 import x2js from "x2js";
 import linq from "linq";
-import { Drawer, Space, Button } from "view-ui-plus";
 import XLSX from "xlsx";
 var commonjsGlobal$1 = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 (function() {
@@ -32382,6 +32382,11 @@ const propDefine$i = {
     // 列配置项
     type: Array,
     default: () => []
+  },
+  xTable: {
+    type: Object,
+    default: () => {
+    }
   }
 };
 const _sfc_main$8 = defineComponent({
@@ -32630,6 +32635,19 @@ class GridColumnInstance extends BaseInstance {
         }
         return filterValue.toString();
       };
+    } else if (column.treeNode && this.utilities.isNull(column.format)) {
+      column.format = (h2, params) => {
+        const row = params.row;
+        const hasChild = row.children && row.children.length > 0;
+        let icon = "md-bookmarks";
+        if (hasChild) {
+          icon = this.props.xTable.isTreeExpandByRow(row) ? "ios-folder-open" : "ios-folder";
+        }
+        return h2(Space, { size: 4 }, () => [
+          h2(Icon, { size: 16, type: icon, color: hasChild ? "#ff9900" : "#2db7f5" }),
+          h2("span", row[column.field])
+        ]);
+      };
     }
   }
   /**
@@ -32671,7 +32689,7 @@ class GridColumnInstance extends BaseInstance {
   }
   //#endregion 事件 END
 }
-const GridColumn_vue_vue_type_style_index_0_scoped_1efb5432_lang = "";
+const GridColumn_vue_vue_type_style_index_0_scoped_1d0a8ef1_lang = "";
 const _hoisted_1$6 = { class: "gridColumn" };
 function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_GridTitleContent = resolveComponent("GridTitleContent");
@@ -32693,7 +32711,10 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", _hoisted_1$6, [
     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (column) => {
       return openBlock(), createElementBlock(Fragment, null, [
-        _ctx.getHasColgroup(column) ? (openBlock(), createBlock(_component_vxe_colgroup, { key: 0 }, {
+        _ctx.getHasColgroup(column) ? (openBlock(), createBlock(_component_vxe_colgroup, {
+          key: 0,
+          align: column.align ? column.align : "center"
+        }, {
           header: withCtx(() => [
             createVNode(_component_GridTitleContent, { column }, null, 8, ["column"])
           ]),
@@ -32703,7 +32724,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["columns"])
           ]),
           _: 2
-        }, 1024)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        }, 1032, ["align"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
           column.colType == "seq" ? (openBlock(), createBlock(_component_vxe_column, {
             key: 0,
             type: "seq",
@@ -32945,7 +32966,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
     }), 256))
   ]);
 }
-const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$8], ["__scopeId", "data-v-1efb5432"]]);
+const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$8], ["__scopeId", "data-v-1d0a8ef1"]]);
 const propDefine$h = {
   option: {
     // Gird 配置项
@@ -33081,10 +33102,12 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
      * @param row 
      */
     __publicField(this, "setCurrentRow", (row) => {
-      this.xTable.value.setCurrentRow(row);
-      if (this.props.option.event && this.props.option.event.currentChange) {
-        const data2 = { "$table": this.xTable.value, row, newValue: row, oldValue: void 0, rowIndex: 1, columnIndex: 0 };
-        this.props.option.event.currentChange(data2);
+      if (this.xTable.value) {
+        this.xTable.value.setCurrentRow(row);
+        if (this.props.option.event && this.props.option.event.currentChange) {
+          const data2 = { "$table": this.xTable.value, row, newValue: row, oldValue: void 0, rowIndex: 1, columnIndex: 0 };
+          this.props.option.event.currentChange(data2);
+        }
       }
     });
     //#region 全局值
@@ -33381,6 +33404,13 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
     __publicField(this, "getRowConfig", () => {
       return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.rowConfig;
     });
+    /**
+     * 校验规则配置项
+     * @returns 
+     */
+    __publicField(this, "getEditRules", () => {
+      return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.editRules;
+    });
     /**
      * 获取树配置
      * @returns 
@@ -33452,6 +33482,9 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
       }
       this.datas.value = _datas;
       nextTick(() => {
+        if (!this.xTable.value) {
+          return;
+        }
         if (this.props.option.setting && this.props.option.setting.isTree && this.props.option.setting.treeConfig && this.props.option.setting.treeConfig.expandAll) {
           this.xTable.value.setAllTreeExpand(true);
         }
@@ -33710,6 +33743,10 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
       if (this.props.option.event && this.props.option.event.event_saveBefore && !this.props.option.event.event_saveBefore(saveDatas)) {
         return;
       }
+      if (!await this.validate()) {
+        this.message.warning("校验失败！");
+        return;
+      }
       this.loadDataing.value = true;
       const apiResult = this.getIsTree() ? await this.props.option.api.saveTree(saveDatas) : await this.props.option.api.saves(saveDatas);
       const result = this.utilities.parseApiResult(apiResult);
@@ -33885,6 +33922,23 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
       await $table.setEditRow(row);
       $table.clearEdit();
     });
+    /**
+     * 编辑校验
+     * @returns 
+     */
+    __publicField(this, "validate", async () => {
+      const $table = this.xTable.value;
+      if ($table) {
+        const errMap = await $table.validate();
+        if (errMap) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    });
     this.props = props;
     this.ctx = ctx;
     this.useSearchPanel();
@@ -34006,7 +34060,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
   }
   //#endregion 公开方法 END
 };
-const Grid_vue_vue_type_style_index_0_scoped_96859f1d_lang = "";
+const Grid_vue_vue_type_style_index_0_scoped_cb63f716_lang = "";
 const _hoisted_1$5 = { class: "nv-crud" };
 const _hoisted_2$4 = { class: "nv-crud-body" };
 const _hoisted_3$3 = { class: "nv-crud-body-search" };
@@ -34116,6 +34170,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
           "row-config": _ctx.getRowConfig(),
           "edit-config": _ctx.getEditConfig(),
           "tree-config": _ctx.getTreeConfig(),
+          "edit-rules": _ctx.getEditRules(),
           onKeydownStart: _ctx.gridEvents.keydownStart,
           onKeydown: _ctx.gridEvents.keydown,
           onKeydownEnd: _ctx.gridEvents.keydownEnd,
@@ -34156,13 +34211,14 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
           default: withCtx(() => [
             createVNode(_component_grid_column, {
               columns: _ctx.option.columns,
+              xTable: _ctx.xTable,
               onClearRadioRow: _ctx.doClearRadioRow,
               onDelete: _ctx.doDelete,
               onAddchild: _ctx.doAddChild
-            }, null, 8, ["columns", "onClearRadioRow", "onDelete", "onAddchild"])
+            }, null, 8, ["columns", "xTable", "onClearRadioRow", "onDelete", "onAddchild"])
           ]),
           _: 1
-        }, 16, ["data", "border", "show-header", "row-config", "edit-config", "tree-config", "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, ["data", "border", "show-header", "row-config", "edit-config", "tree-config", "edit-rules", "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)
@@ -34179,7 +34235,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__scopeId", "data-v-96859f1d"]]);
+const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__scopeId", "data-v-cb63f716"]]);
 const propDefine$g = {
   width: {
     // Box 宽度
@@ -186904,6 +186960,9 @@ class PrintApi extends BaseInstance {
     const order = Number(sheetHandle);
     const sheet = this.luckysheet.getSheet({ order });
     if (!this.utilities.isNull(sheet)) {
+      if (sheet.config.printPage == void 0) {
+        sheet.config.printPage = {};
+      }
       sheet.config.printPage.oriantation = isPortrait ? "portrait" : "landscape";
     }
   }
@@ -186919,6 +186978,9 @@ class PrintApi extends BaseInstance {
     const order = Number(sheetHandle);
     const sheet = this.luckysheet.getSheet({ order });
     if (!this.utilities.isNull(sheet)) {
+      if (sheet.config.printPage == void 0) {
+        sheet.config.printPage = {};
+      }
       sheet.config.printPage.marginBottom = bottom;
       sheet.config.printPage.marginLeft = left;
       sheet.config.printPage.marginRight = right;
@@ -186933,8 +186995,12 @@ class PrintApi extends BaseInstance {
   getOriantation(sheetHandle = "") {
     const order = this.utilities.isNull(sheetHandle) ? this.reportApi.sheetApi.getSheetIndex() : Number(sheetHandle);
     const sheet = this.reportApi.sheetApi.getSheet(order);
-    const oriantation = sheet.config.printPage.oriantation;
-    return oriantation;
+    if (sheet.config.printPage == void 0) {
+      const oriantation = sheet.config.printPage.oriantation;
+      return oriantation;
+    } else {
+      return "";
+    }
   }
   /**
    * 获取打印页设置
@@ -186944,7 +187010,8 @@ class PrintApi extends BaseInstance {
   getPrintPage(sheetHandle = "") {
     const order = this.utilities.isNull(sheetHandle) ? this.reportApi.sheetApi.getSheetIndex() : Number(sheetHandle);
     const sheet = this.reportApi.sheetApi.getSheet(order);
-    return sheet.config.printPage;
+    const printPage = sheet.config.printPage;
+    return printPage ?? {};
   }
   /**
    * 自适应选定页A4
@@ -186967,7 +187034,7 @@ class PrintApi extends BaseInstance {
       sheetIndexs.split(",").forEach((el) => {
         let sheetHandle = el;
         const sheet = this.luckysheet.getSheet({ order: sheetHandle });
-        const oriantation = sheet.config.printPage.oriantation;
+        const oriantation = sheet.config.printPage == void 0 ? "" : sheet.config.printPage.oriantation;
         this.setSheetA4Size(sheetHandle, oriantation == "portrait", leftPx, rightPx, topPx, bottomPx);
       });
     }
@@ -188516,25 +188583,48 @@ class ReportApi extends BaseInstance {
   }
   /**
    * 加载 模板及数据
-   * @param content
-   * @param callback
+   * @param content 
+   * @param callback 
+   * @param isHttp 
    */
-  build(content, callback) {
-    let jsonContent = {};
-    if (content != null && content != "") {
-      if (content.indexOf("<?xml") != -1) {
-        jsonContent = LuckyConvert.transformSuXmlToLucky(content);
-      } else {
-        if (JSON.parse(content).constructor == Array) {
-          jsonContent = JSON.parse(content);
+  build(content, callback, isHttp = false) {
+    if (isHttp) {
+      this.importReportByUrl(content, callback);
+    } else {
+      let jsonContent = {};
+      if (content != null && content != "") {
+        if (content.indexOf("<?xml") != -1) {
+          jsonContent = LuckyConvert.transformSuXmlToLucky(content);
         } else {
-          jsonContent = JSON.parse(eval("" + content));
+          if (JSON.parse(content).constructor == Array) {
+            jsonContent = JSON.parse(content);
+          } else {
+            jsonContent = JSON.parse(eval("" + content));
+          }
         }
+        this.instanceopts.data = jsonContent;
       }
-      this.instanceopts.data = jsonContent;
+      this.loadCallback = callback;
+      luckysheet$2.create(this.instanceopts);
     }
-    this.loadCallback = callback;
-    luckysheet$2.create(this.instanceopts);
+  }
+  /**
+   * 通过Url导入报表
+   * @param fileUrl 
+   * @param callback 
+   */
+  importReportByUrl(fileUrl, callback2) {
+    LuckyConvert.transformExcelToLuckyByUrl(fileUrl, "", (exportJson, luckysheetfile) => {
+      if (exportJson.sheets == null || exportJson.sheets.length == 0) {
+        this.message.warning(
+          "Failed to read the content of the excel file, currently does not support xls files!"
+        );
+        return;
+      }
+      this.instanceopts.data = exportJson.sheets;
+      this.loadCallback = callback2;
+      luckysheet$2.create(this.instanceopts);
+    });
   }
   /**
    * 导入报表
@@ -190776,10 +190866,12 @@ class GridInstance extends BaseInstance {
      * @param row 
      */
     __publicField(this, "setCurrentRow", (row) => {
-      this.xTable.value.setCurrentRow(row);
-      if (this.props.option.event && this.props.option.event.currentChange) {
-        const data2 = { "$table": this.xTable.value, row, newValue: row, oldValue: void 0, rowIndex: 1, columnIndex: 0 };
-        this.props.option.event.currentChange(data2);
+      if (this.xTable.value) {
+        this.xTable.value.setCurrentRow(row);
+        if (this.props.option.event && this.props.option.event.currentChange) {
+          const data2 = { "$table": this.xTable.value, row, newValue: row, oldValue: void 0, rowIndex: 1, columnIndex: 0 };
+          this.props.option.event.currentChange(data2);
+        }
       }
     });
     //#region 全局值
@@ -191076,6 +191168,13 @@ class GridInstance extends BaseInstance {
     __publicField(this, "getRowConfig", () => {
       return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.rowConfig;
     });
+    /**
+     * 校验规则配置项
+     * @returns 
+     */
+    __publicField(this, "getEditRules", () => {
+      return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.editRules;
+    });
     /**
      * 获取树配置
      * @returns 
@@ -191147,6 +191246,9 @@ class GridInstance extends BaseInstance {
       }
       this.datas.value = _datas;
       nextTick(() => {
+        if (!this.xTable.value) {
+          return;
+        }
         if (this.props.option.setting && this.props.option.setting.isTree && this.props.option.setting.treeConfig && this.props.option.setting.treeConfig.expandAll) {
           this.xTable.value.setAllTreeExpand(true);
         }
@@ -191405,6 +191507,10 @@ class GridInstance extends BaseInstance {
       if (this.props.option.event && this.props.option.event.event_saveBefore && !this.props.option.event.event_saveBefore(saveDatas)) {
         return;
       }
+      if (!await this.validate()) {
+        this.message.warning("校验失败！");
+        return;
+      }
       this.loadDataing.value = true;
       const apiResult = this.getIsTree() ? await this.props.option.api.saveTree(saveDatas) : await this.props.option.api.saves(saveDatas);
       const result = this.utilities.parseApiResult(apiResult);
@@ -191580,6 +191686,23 @@ class GridInstance extends BaseInstance {
       await $table.setEditRow(row);
       $table.clearEdit();
     });
+    /**
+     * 编辑校验
+     * @returns 
+     */
+    __publicField(this, "validate", async () => {
+      const $table = this.xTable.value;
+      if ($table) {
+        const errMap = await $table.validate();
+        if (errMap) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    });
     this.props = props;
     this.ctx = ctx;
     this.useSearchPanel();