@vipl520/dk-ui 1.0.58 → 1.0.60

package/dist/index.js

@@ -973,6 +973,10 @@
     title: {
       default: "",
       type: String
+    },
+    accordion: {
+      type: Boolean,
+      default: true
     }
   };
 
@@ -997,7 +1001,8 @@
         loading: true
       });
       const collapseComponentData = vue.reactive({
-        modelValue: [0]
+        modelValue: [0],
+        accordion: props.accordion
       });
       const Type = data.form;
       vue.watch(
@@ -18855,34 +18860,49 @@
   class dkTableApi {
     controllerUrl;
     actionUrl;
+    query;
     requestConfig = {};
     // 新增：用于存储配置的request参数
     constructor(controllerUrl, query) {
-      const qStr = this.objectToQuery(query);
-      console.log("queryStr", qStr);
+      let qStr = this.objectToQuery(query);
+      if (controllerUrl.indexOf("?") > 0) {
+        const path = controllerUrl.split("?");
+        controllerUrl = path[0];
+        qStr = qStr + "&" + path[1];
+      }
+      this.query = qStr;
       if (!controllerUrl.endsWith("/")) {
         controllerUrl += "/";
       }
       this.controllerUrl = controllerUrl;
-      this.actionUrl = /* @__PURE__ */ new Map([
-        ["index", this.buildFullUrl(controllerUrl + "index", qStr)],
-        ["add", this.buildFullUrl(controllerUrl + "add", qStr)],
-        ["edit", this.buildFullUrl(controllerUrl + "edit", qStr)],
-        ["del", this.buildFullUrl(controllerUrl + "del", qStr)],
-        ["sortable", this.buildFullUrl(controllerUrl + "sortable", qStr)],
-        ["table", this.buildFullUrl(controllerUrl + "table", qStr)],
-        // 获取表格数据
-        ["form", this.buildFullUrl(controllerUrl + "form", qStr)],
-        // 获取表单
-        ["recycle", this.buildFullUrl(controllerUrl + "recycle", qStr)],
-        // 回收站
-        ["recycleTable", this.buildFullUrl(controllerUrl + "recycleTable", qStr)],
+      const actions = [
+        "index",
+        // 列表
+        "add",
+        // 新增
+        "edit",
+        // 编辑
+        "del",
+        // 删除
+        "sortable",
+        // 排序
+        "table",
+        // 表格数据
+        "form",
+        // 表单
+        "recycle",
+        // 回收站数据
+        "recycleTable",
         // 回收站表格
-        ["destroy", this.buildFullUrl(controllerUrl + "destroy", qStr)],
+        "destroy",
         // 回收站销毁
-        ["restore", this.buildFullUrl(controllerUrl + "restore", qStr)]
+        "restore"
         // 回收站还原
-      ]);
+      ];
+      this.actionUrl = /* @__PURE__ */ new Map();
+      for (const action of actions) {
+        this.actionUrl.set(action, this.buildFullUrl(`${controllerUrl}${action}`, qStr));
+      }
     }
     // 新增方法用于构建完整的URL
     buildFullUrl(baseUrl, queryStr) {