mooho-base-admin-plus 2.10.11 → 2.10.13

package/history.md

@@ -182,3 +182,5 @@ mooho-base-admin-plus@2.10.8 - 待办任务增加全屏
 mooho-base-admin-plus@2.10.9 - 优化流程查询性能，允许按需返回数据
 mooho-base-admin-plus@2.10.10 - 修复默认筛选的bug
 mooho-base-admin-plus@2.10.11 - 增加弹出表单控件
+mooho-base-admin-plus@2.10.12 - 优化表格调整顺序功能
+mooho-base-admin-plus@2.10.13 - 内嵌表格如果是必填，新增时默认一行

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

@@ -41454,8 +41454,11 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_r
      */
     setDefault(a) {
       if (this.data = this.getDefaultData(), a)
-        for (let r in a)
-          this.data[r] = a[r];
+        for (let o in a)
+          this.data[o] = a[o];
+      let r = this.columns.filter((o) => o.controlType == "Table" && o.isRequired);
+      for (let o of r)
+        this.$refs["table_" + o.code][0].addNew();
       this.clearValidate();
     },
     /**
@@ -42432,7 +42435,7 @@ var getColumns = (a, r, o) => {
       width: l[r.code] ? l[r.code] : r.controlWidth,
       minWidth: 100,
       align: r.align ? r.align.toLowerCase() : "center",
-      sortable: !a.dataView.sortDisable && !r.sortDisable && (!r.isVirtual || o) ? "custom" : !1,
+      sortable: !a.dataView.sortDisable && !a.dataView.adjustEnable && !r.sortDisable && (!r.isVirtual || o) ? "custom" : !1,
       resizable: !0,
       slot: "normal"
     };
@@ -43035,9 +43038,15 @@ const _sfc_main$n = {
      */
     getData() {
       let a = null;
-      return this.static ? a = this.copy(this.staticData) : a = this.copy(this.data), a.forEach((r) => {
-        delete r._checked, delete r._dataSource, delete r._needRefresh, delete r._needClear, delete r._rawData, delete r._disabled;
-      }), a;
+      if (this.static ? a = this.copy(this.staticData) : a = this.copy(this.data), a.forEach((r) => {
+        for (let o in r)
+          o.startsWith("_") && delete r[o];
+      }), console.log("data", a), this.tableView.adjustEnable) {
+        let r = 0;
+        for (let o of a)
+          o.orderNo = r, r += 10;
+      }
+      return a;
     },
     /**
      * 重置筛选
@@ -43497,22 +43506,12 @@ const _sfc_main$n = {
     // 上移
     up(a, r) {
       let o = this.staticData;
-      if (r > 0) {
-        o.splice(r, 1), o.splice(r - 1, 0, a);
-        for (let s of o)
-          delete s.id;
-        this.loadData(o);
-      }
+      r > 0 && (o.splice(r, 1), o.splice(r - 1, 0, a), this.loadData(o));
     },
     // 下移
     down(a, r) {
       let o = this.staticData;
-      if (r < o.length - 1) {
-        o.splice(r, 1), o.splice(r + 1, 0, a);
-        for (let s of o)
-          delete s.id;
-        this.loadData(o);
-      }
+      r < o.length - 1 && (o.splice(r, 1), o.splice(r + 1, 0, a), this.loadData(o));
     },
     // 清空数据
     clear() {
@@ -44381,7 +44380,7 @@ function _sfc_render$n(a, r, o, s, l, u) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-0728e452"]]), __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-614d1779"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {