mooho-base-admin-plus 2.8.1 → 2.8.3

package/history.md

@@ -142,3 +142,5 @@ mooho-base-admin-plus@2.7.6 - 修复审批后没有刷新的bug
 mooho-base-admin-plus@2.7.7 - 增加自定义显示格式
 mooho-base-admin-plus@2.8.0 - 表格增加只返回所需字段的选项
 mooho-base-admin-plus@2.8.1 - 表格增加必须返回的字段属性
+mooho-base-admin-plus@2.8.2 - 优化树结构显示方式
+mooho-base-admin-plus@2.8.3 - 修复只返回所需字段的bug

package/package/mooho-base-admin-plus.min.esm.js

@@ -20263,7 +20263,7 @@ function _sfc_render$15(r, a, o, s, l, u) {
           column: withCtx(({ row: y, column: _, code: S }) => [
             S == "name" ? (openBlock(), createElementBlock("div", {
               key: 0,
-              style: normalizeStyle$1({ "font-weight": y.hasChildren ? "bold" : "", "text-indent": y._depth * 12 + "px" })
+              style: normalizeStyle$1({ "font-weight": y.hasChildren ? "bold" : "" })
             }, toDisplayString$2(r.showData(y, _)), 5)) : createCommentVNode("", !0)
           ]),
           _: 1
@@ -40982,7 +40982,12 @@ const _sfc_main$n = {
         }
         if (this.tableView = s.dataView, this.tableView.columns = s.viewColumns, this.tableView.filterColumns = s.filterColumns, this.filterColumns = s.filterColumns, (this.tableView.commandButton || "").trim() ? this.commandButtons = JSON.parse(this.tableView.commandButton) : this.commandButtons = [], this.$emit("on-ready", this.tableView), this.columns = s.viewColumns.filter((l) => !(l.parentCode || "").trim()).map((l) => getColumns(s, l)), this.columns.forEach((l) => {
           l.name = this.getNameI18n(l) + (l.isRequired ? ' <font color="red">*</font>' : ""), l.fixed = l.isFixed ? "left" : null;
-        }), this.tableView.snEnable && this.columns.unshift({
+        }), this.treeEnable && (this.columns.length > 0 ? (this.columns[0].tree = !0, this.columns[0].display = "inline-block") : this.columns.unshift({
+          tree: !0,
+          display: "inline",
+          align: "left",
+          width: 100
+        })), this.tableView.snEnable && this.columns.unshift({
           title: this.$t("Front_Label_Sn"),
           slot: "sn",
           align: "center",
@@ -41033,11 +41038,6 @@ const _sfc_main$n = {
           type: "selection",
           align: "center",
           width: 60
-        }), this.treeEnable && this.columns.unshift({
-          tree: !0,
-          display: "inline",
-          align: "left",
-          width: 100
         }), this.tableView.size ? this.size = this.tableView.size : this.tableView.pageEnable && this.pageEnable ? this.size = Setting.layout.pageSize : this.size = 1e3, this.tableView.sorting) {
           let l = JSON.parse(this.tableView.sorting), u = [];
           for (let c in l)
@@ -41081,7 +41081,12 @@ const _sfc_main$n = {
             orderBy: this.orderBy
           };
           if (this.tableView.isGroupBy && (a.isGroupBy = !0, a.groupColumn = JSON.parse(this.tableView.groupColumn), a.groupMethod = JSON.parse(this.tableView.groupMethod)), this.tableView.isCustom) {
-            let o = await customModelApi.query(this.tableView.model, a, this.returnColumns, this.tableView.isReturnSimple ? this.tableView : null);
+            let o = await customModelApi.query(
+              this.tableView.model,
+              a,
+              this.tableView.isReturnSimple ? this.returnColumns : null,
+              this.tableView.isReturnSimple ? this.tableView : null
+            );
             this.total = o.totalCount, this.data = o.data;
           } else if (this.tableView.isDataSource) {
             let o = await dataSourceApi.query(this.tableView.dataSource, a);
@@ -41090,7 +41095,7 @@ const _sfc_main$n = {
             let o = await modelApi.query(
               this.tableView.model,
               a,
-              this.returnColumns,
+              this.tableView.isReturnSimple ? this.returnColumns : null,
               this.tableView.isReturnSimple ? this.tableView : null,
               this.tableView.functionName,
               this.tableView.functionType
@@ -41994,7 +41999,6 @@ function _sfc_render$n(r, a, o, s, l, u) {
         size: "small",
         stripe: "",
         "row-key": "id",
-        "indent-size": 18,
         "update-show-children": o.treeEnable,
         columns: l.columns,
         data: l.data,
@@ -42562,7 +42566,7 @@ function _sfc_render$n(r, a, o, s, l, u) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-1cb5962f"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-887433c2"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {