t20-common-lib 0.12.12 → 0.12.13

package/package.json

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

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

@@ -126,15 +126,15 @@
 </template>
 
 <script>
-import Tree from "./selectTree/Tree/index.vue";
-import ElSelect from "./selectTree/Extends/ElSelect.vue";
+import Tree from "../../../src/common/selectTree/Tree/index.vue";
+import ElSelect from "../../../src/common/selectTree/Extends/ElSelect.vue";
 import Filters from "../../../src/common/Filters/index.vue"
 import request from "@/utils/request";
 import { getCommonConfig } from "../../../src/api/common";
-import treeSelectImg from "./selectTree/imgs/tree-select.png";
-import treeUnSelectImg from "./selectTree/imgs/tree-unselect.png";
-import listSelectImg from "./selectTree/imgs/list-select.png";
-import listUnSelectImg from "./selectTree/imgs/list-unselect.png";
+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) {
@@ -697,12 +697,14 @@ export default {
         new Promise((resolve) => {
           this.getTreeData("1", { resolve, expandFlag: true });
         }).then((data) => {
-          // if (data) {
-          //   //默认展开节点
-          //   this.defaultExpandedKeys = [data.id];
-          // }
+          let flatTemp = [];
+          this.flatData(this.data, flatTemp);
+          //去除没有权限的单位
+          flatTemp = flatTemp.filter((s) => {
+            return !s.disabled;
+          });
           this.checkD = true;
-          this.selectData = JSON.parse(JSON.stringify(this.data));
+          this.selectData = JSON.parse(JSON.stringify(flatTemp));
           this.valueShow = this.$t("common_a_0003");
           this.$nextTick(() => {
             console.log(11111, this.selectData);

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

@@ -653,12 +653,14 @@ export default {
         new Promise((resolve) => {
           this.getTreeData("1", { resolve, expandFlag: true });
         }).then((data) => {
-          // if (data) {
-          //   //默认展开节点
-          //   this.defaultExpandedKeys = [data.id];
-          // }
+          let flatTemp = [];
+          this.flatData(this.data, flatTemp);
+          //去除没有权限的单位
+          flatTemp = flatTemp.filter((s) => {
+            return !s.disabled;
+          });
           this.checkD = true;
-          this.selectData = JSON.parse(JSON.stringify(this.data));
+          this.selectData = JSON.parse(JSON.stringify(flatTemp));
           this.valueShow = this.$t("common_a_0003");
           this.$nextTick(() => {
             console.log(11111, this.selectData);