t20-common-lib 0.12.5 → 0.12.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.12.5",
+  "version": "0.12.7",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/select-tree-unit/src/main.vue

@@ -129,14 +129,27 @@
 import Tree from "../../../src/common/selectTree/Tree/index.vue";
 import ElSelect from "../../../src/common/selectTree/Extends/ElSelect.vue";
 import Filters from "../../../src/common/selectTree/Filters/index.vue"
-import forEachs from "../../../src/common/selectTree/forEachs";
-import request from "../../../src/utils/request";
-import { getToken } from "../../../src/utils/auth";
+import request from "@/utils/request";
 import { getCommonConfig } from "../../../src/api/common";
 import treeSelectImg from "../../../src/common/selectTree/imgs/tree-select.png";
 import treeUnSelectImg from "../../../src/common/selectTree/imgs/tree-unselect.png";
 import listSelectImg from "../../../src/common/selectTree/imgs/list-select.png";
 import listUnSelectImg from "../../../src/common/selectTree/imgs/list-unselect.png";
+
+/** 兼容接口返回体在 res 顶层或 res.data */
+function unwrapRequestData(res) {
+  if (res == null || typeof res !== "object") return res;
+  if (Array.isArray(res)) return res;
+  const hasPayloadKeys =
+    Object.prototype.hasOwnProperty.call(res, "fundTreeVoList") ||
+    Object.prototype.hasOwnProperty.call(res, "records") ||
+    Object.prototype.hasOwnProperty.call(res, "onlyUnit") ||
+    Object.prototype.hasOwnProperty.call(res, "firstAuthUnit");
+  if (hasPayloadKeys) return res;
+  if (res.data != null && typeof res.data === "object") return res.data;
+  return res;
+}
+
 export default {
   name: "SelectTreeUnit",
   components: { ElSelect, Tree, Filters },
@@ -456,7 +469,7 @@ export default {
     },
     async getCommonConfig(resolve) {
       let res = await getCommonConfig();
-      res = res.data
+      res = unwrapRequestData(res)
       if (res && res.length > 0) {
         res.forEach((r) => {
           if (r.configGroupName.includes("单位树")) {
@@ -542,7 +555,7 @@ export default {
       }
       request({ url: this.url + str, method: "GET", cache:true, headers }).then((res) => {
         this.loading = false;
-        res = res.data
+        res = unwrapRequestData(res)
         let data = res.fundTreeVoList;
         // if (code == 200) {
         if (data && data.length > 0) {
@@ -1100,7 +1113,7 @@ export default {
         data: params,
         headers, cache:true,
       }).then((res) => {
-        res = res.data
+        res = unwrapRequestData(res)
         console.log(6666);
         this.loading = false;
         if (res.records && res.records.length > 0) {

package/packages/select-tree-unit-form/src/main.vue

@@ -110,12 +110,27 @@ import emitter from "element-ui/src/mixins/emitter";
 import Tree from "../../../src/common/selectTree/Tree/index.vue";
 import ElSelect from "../../../src/common/selectTree/Extends/ElSelect.vue";
 import Filters from "../../../src/common/selectTree/Filters/index.vue"
-import request from "../../../src/utils/request";
+import request from "@/utils/request";
 import { getCommonConfig } from "../../../src/api/common";
 import treeSelectImg from "../../../src/common/selectTree/imgs/tree-select.png";
 import treeUnSelectImg from "../../../src/common/selectTree/imgs/tree-unselect.png";
 import listSelectImg from "../../../src/common/selectTree/imgs/list-select.png";
 import listUnSelectImg from "../../../src/common/selectTree/imgs/list-unselect.png";
+
+/** 兼容接口返回体在 res 顶层或 res.data */
+function unwrapRequestData(res) {
+  if (res == null || typeof res !== "object") return res;
+  if (Array.isArray(res)) return res;
+  const hasPayloadKeys =
+    Object.prototype.hasOwnProperty.call(res, "fundTreeVoList") ||
+    Object.prototype.hasOwnProperty.call(res, "records") ||
+    Object.prototype.hasOwnProperty.call(res, "onlyUnit") ||
+    Object.prototype.hasOwnProperty.call(res, "firstAuthUnit");
+  if (hasPayloadKeys) return res;
+  if (res.data != null && typeof res.data === "object") return res.data;
+  return res;
+}
+
 export default {
   name: "SelectTreeUnitForm",
   components: { Tree, ElSelect, Filters },
@@ -361,7 +376,7 @@ export default {
     },
     async getCommonConfig(resolve) {
       let res = await getCommonConfig();
-      res = res.data
+      res = unwrapRequestData(res)
       if (res && res.length > 0) {
         res.forEach((r) => {
           if (r.configGroupName.includes("单位树")) {
@@ -498,7 +513,7 @@ export default {
         cache: true,
         headers,
       }).then((res) => {
-        res = res.data
+        res = unwrapRequestData(res)
         let data = res.fundTreeVoList;
         this.loading = false;
         if (data && data.length > 0) {
@@ -1018,7 +1033,7 @@ export default {
         headers,
         cache: true,
       });
-      res = res.data
+      res = unwrapRequestData(res)
       this.loading = false;
       if (res.records && res.records.length > 0) {
         res.records.forEach((r) => {