ol-base-components 3.6.1 → 3.6.3

package/dist/index.mjs

@@ -13800,7 +13800,7 @@ var render$2 = function() {
     }) : _vm._e(), _vm._v(" " + _vm._s(btn.title) + " ")]);
   }), _vm._t("toolbarAfter", null, null, _vm.toolbarSlotScope)], 2), _c("div", {
     staticClass: "crud-toolbar-right"
-  }, [_vm._t("toolbarActions", null, null, _vm.toolbarSlotScope), _vm.$cfg("showColumnFilterBtn") ? [_vm.columnConfigMode === "simple" ? _c("el-dropdown", {
+  }, [_vm._t("toolbarActions", null, null, _vm.toolbarSlotScope), _vm.$cfg("showColumnFilterBtn") ? [_vm.resolvedColumnConfigMode === "simple" ? _c("el-dropdown", {
     staticClass: "crud-toolbar-action",
     attrs: {
       "trigger": "click"
@@ -13926,11 +13926,6 @@ var render$2 = function() {
       })], null, true)
     })];
   })], _vm.operates && _vm.operates.length > 0 ? _c("el-table-column", _vm._b({
-    attrs: {
-      "label": "操作",
-      "align": "center",
-      "min-width": _vm.operatesMinWidth
-    },
     scopedSlots: _vm._u([{
       key: "default",
       fn: function(_ref2) {
@@ -13956,7 +13951,11 @@ var render$2 = function() {
         })], 2)];
       }
     }], null, false, 2917153455)
-  }, "el-table-column", _vm.operatesAttrs || {}, false)) : _vm._e(), _c("div", {
+  }, "el-table-column", Object.assign({
+    label: "操作",
+    align: "center",
+    minWidth: _vm.operatesMinWidth
+  }, _vm.operatesAttrs || {}), false)) : _vm._e(), _c("div", {
     staticClass: "crud-empty",
     attrs: {
       "slot": "empty"
@@ -13969,7 +13968,7 @@ var render$2 = function() {
   }, [_c("el-pagination", {
     attrs: {
       "current-page": _vm.displayPagination.page,
-      "page-sizes": _vm.pageSizes,
+      "page-sizes": _vm.resolvedPageSizes,
       "page-size": _vm.displayPagination.limit,
       "total": _vm.displayPagination.total,
       "layout": "total, sizes, prev, pager, next, jumper"
@@ -13978,7 +13977,7 @@ var render$2 = function() {
       "size-change": _vm.onSizeChange,
       "current-change": _vm.onPageChange
     }
-  })], 1) : _vm._e(), _vm.columnConfigMode === "persisted" ? _c("ol-column-config", {
+  })], 1) : _vm._e(), _vm.resolvedColumnConfigMode === "persisted" ? _c("ol-column-config", {
     attrs: {
       "visible": _vm.columnConfigVisible,
       "columns": _vm.columnsForConfig,
@@ -13996,7 +13995,7 @@ var render$2 = function() {
     attrs: {
       "visible": _vm.entityChangeVisible,
       "selected-rows": _vm.currentSelection,
-      "page-params": _vm.pageParams
+      "page-params": _vm.resolvedPageParams
     },
     on: {
       "update:visible": function($event) {
@@ -14020,7 +14019,15 @@ var render$2 = function() {
 var staticRenderFns$2 = [];
 const index_vue_vue_type_style_index_0_scoped_true_lang$1 = "";
 const index_vue_vue_type_style_index_1_lang$1 = "";
-const DATE_TYPES = ["date", "datetime", "daterange", "datetimerange", "month", "monthrange", "year"];
+const DATE_TYPES = [
+  "date",
+  "datetime",
+  "daterange",
+  "datetimerange",
+  "month",
+  "monthrange",
+  "year"
+];
 const newFieldToOld = (field) => ({
   ...field,
   value: field.prop,
@@ -14196,7 +14203,11 @@ const __vue2_script$2 = {
       fetchingData: false,
       // 自动请求模式下的内部数据存储
       internalTableData: [],
-      internalPagination: { page: 1, limit: 30, total: 0 },
+      internalPagination: {
+        page: 1,
+        limit: this.$olBaseConfig && this.$olBaseConfig.pagination && this.$olBaseConfig.pagination.limit || 30,
+        total: 0
+      },
       // 打印数据
       printListObj: { title: "", tableHeader: [], tableData: [] },
       // 列配置弹窗（persisted 模式）
@@ -14209,9 +14220,45 @@ const __vue2_script$2 = {
     };
   },
   computed: {
-    /** 实际请求方式 */
+    /** 实际请求方式（三级优先级：prop > $olBaseConfig > 默认 'get'） */
     finalMethod() {
-      return this.method || this.$olBaseConfig && this.$olBaseConfig.method || "get";
+      if (this.$options.propsData && "method" in this.$options.propsData) {
+        return this.method;
+      }
+      const base = this.$olBaseConfig || {};
+      if (base.method !== void 0)
+        return base.method;
+      return "get";
+    },
+    /** 列配置模式（三级优先级） */
+    resolvedColumnConfigMode() {
+      if (this.$options.propsData && "columnConfigMode" in this.$options.propsData) {
+        return this.columnConfigMode;
+      }
+      const base = this.$olBaseConfig || {};
+      if (base.columnConfigMode !== void 0)
+        return base.columnConfigMode;
+      return this.columnConfigMode;
+    },
+    /** 分页参数名映射（三级优先级） */
+    resolvedPageParams() {
+      if (this.$options.propsData && "pageParams" in this.$options.propsData) {
+        return this.pageParams;
+      }
+      const base = this.$olBaseConfig || {};
+      if (base.pageParams !== void 0)
+        return base.pageParams;
+      return this.pageParams;
+    },
+    /** 每页条数选项（三级优先级） */
+    resolvedPageSizes() {
+      if (this.$options.propsData && "pageSizes" in this.$options.propsData) {
+        return this.pageSizes;
+      }
+      const base = this.$olBaseConfig || {};
+      if (base.pageSizes !== void 0)
+        return base.pageSizes;
+      return this.pageSizes;
     },
     /** 是否启用内部数据管理（自动模式有 url，手动模式有 fetchData） */
     shouldAutoFetch() {
@@ -14373,7 +14420,7 @@ const __vue2_script$2 = {
   },
   async mounted() {
     this.syncColumnSlots();
-    if (this.$cfg("showColumnFilterBtn") && this.columnConfigMode === "persisted") {
+    if (this.$cfg("showColumnFilterBtn") && this.resolvedColumnConfigMode === "persisted") {
       await this.loadColumnConfig();
     }
     if (this.$cfg("showCustomSearch")) {
@@ -14486,7 +14533,11 @@ const __vue2_script$2 = {
               manualField.prop = userProp;
             } else {
               this.searchFields.push(swaggerField);
-              this.$set(this.internalSearchModel, swaggerField.prop, swaggerField.defaultValue ?? null);
+              this.$set(
+                this.internalSearchModel,
+                swaggerField.prop,
+                swaggerField.defaultValue != null ? swaggerField.defaultValue : null
+              );
             }
           });
           this.autoDetectRangeTimeFields(parameters);
@@ -14662,7 +14713,11 @@ const __vue2_script$2 = {
           type: "datetimerange",
           visible: true,
           defaultValue: null,
-          props: { valueFormat: "yyyy-MM-dd HH:mm:ss", format: "yyyy/MM/dd HH:mm:ss", defaultTime: ["00:00:00", "23:59:59"] },
+          props: {
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy/MM/dd HH:mm:ss",
+            defaultTime: ["00:00:00", "23:59:59"]
+          },
           originalFields: { begin: "BeginTime", end: "EndTime" }
         });
       }
@@ -14683,7 +14738,11 @@ const __vue2_script$2 = {
           type: "datetimerange",
           visible: true,
           defaultValue: null,
-          props: { valueFormat: "yyyy-MM-dd HH:mm:ss", format: "yyyy/MM/dd HH:mm:ss", defaultTime: ["00:00:00", "23:59:59"] },
+          props: {
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            format: "yyyy/MM/dd HH:mm:ss",
+            defaultTime: ["00:00:00", "23:59:59"]
+          },
           originalFields: { begin: beginParam.name, end: endName }
         });
         const rmBeginIdx = searchFields.findIndex((f2) => f2.prop === beginParam.name);
@@ -14697,11 +14756,14 @@ const __vue2_script$2 = {
       });
       toAdd.forEach((f2) => {
         searchFields.push(f2);
-        this.$set(this.internalSearchModel, f2.prop, f2.defaultValue ?? null);
+        this.$set(this.internalSearchModel, f2.prop, f2.defaultValue != null ? f2.defaultValue : null);
       });
       if (toAdd.length) {
         this.initSearchDefaults();
-        console.log(`\x1B[36m\x1B[4mol-crud 自动识别日期范围字段`, toAdd.map((f2) => f2.prop));
+        console.log(
+          `\x1B[36m\x1B[4mol-crud 自动识别日期范围字段`,
+          toAdd.map((f2) => f2.prop)
+        );
       }
     },
     // ===================== 搜索 =====================
@@ -14779,7 +14841,7 @@ const __vue2_script$2 = {
     async fetchList() {
       if (!this.shouldAutoFetch)
         return;
-      const { page: pageKey, limit: limitKey } = this.pageParams || {};
+      const { page: pageKey, limit: limitKey } = this.resolvedPageParams || {};
       const page = this.internalPagination.page;
       const limit = this.internalPagination.limit;
       const { cleanParams } = this.buildSearchParams();
@@ -14818,7 +14880,9 @@ const __vue2_script$2 = {
           if (!apiUrl)
             return;
           if (typeof this.get !== "function" && typeof this.post !== "function") {
-            console.warn("[ol-crud] 未找到 this.get/this.post，无法自动拉取数据，请使用 fetchData 或手动传入 tableData");
+            console.warn(
+              "[ol-crud] 未找到 this.get/this.post，无法自动拉取数据，请使用 fetchData 或手动传入 tableData"
+            );
             return;
           }
           let params;
@@ -14882,7 +14946,7 @@ const __vue2_script$2 = {
       }
       const result = response && response.result || response || {};
       const rows = result.items || result.records || result.list || result.data || [];
-      const total = result.total ?? result.totalCount ?? result.count ?? rows.length ?? 0;
+      const total = result.total != null ? result.total : result.totalCount != null ? result.totalCount : result.count != null ? result.count : rows.length != null ? rows.length : 0;
       if (Array.isArray(result)) {
         return { rows: result, total: result.length };
       }
@@ -15029,12 +15093,30 @@ const __vue2_script$2 = {
           });
         };
         walkUser(this.columns);
-        const sorted = [...fields].sort((a2, b2) => (a2.order ?? 0) - (b2.order ?? 0));
+        const sorted = [...fields].sort(
+          (a2, b2) => (a2.order != null ? a2.order : 0) - (b2.order != null ? b2.order : 0)
+        );
         const apiColumns = sorted.map((f2) => {
           const user = userColMap[f2.fieldName];
-          const base = { prop: f2.fieldName, label: f2.displayName || f2.fieldName, show: f2.isVisible !== false, fixed: f2.isFixed || false, sortable: false };
+          const base = {
+            prop: f2.fieldName,
+            label: f2.displayName || f2.fieldName,
+            show: f2.isVisible !== false,
+            fixed: f2.isFixed || false,
+            sortable: false
+          };
           if (user) {
-            return { ...base, render: user.render, renderSlot: user.renderSlot, sortable: user.sortable, attrs: user.attrs, width: user.width, minWidth: user.minWidth, children: user.children, enumName: f2.enumName || user.enumName };
+            return {
+              ...base,
+              render: user.render,
+              renderSlot: user.renderSlot,
+              sortable: user.sortable,
+              attrs: user.attrs,
+              width: user.width,
+              minWidth: user.minWidth,
+              children: user.children,
+              enumName: f2.enumName || user.enumName
+            };
           }
           return { ...base, enumName: f2.enumName || void 0 };
         });
@@ -15258,7 +15340,7 @@ var __component__$2 = /* @__PURE__ */ normalizeComponent(
   staticRenderFns$2,
   false,
   __vue2_injectStyles$2,
-  "0acfdd91",
+  "6f1e4166",
   null,
   null
 );