lw-cdp-ui 1.3.7 → 1.3.8

package/dist/components/lwLayout/components/tags.vue

@@ -179,14 +179,18 @@ export default {
     closeSelectedTag(tag, autoPushLatestView = true) {
       let item = this.menu[0]
       if (item.children) {
-        item =  item.children[0]
+        item = item.children[0]
       }
-
+      
       // 兼容合并菜单
-      if (item.meta?.code) {
+      if (item.meta?.code && item.meta?.code != this.$config.APP_NAME.toLowerCase()) {
         item.path = `/i/${item.name}`
       }
 
+      if (this.tagList.length == 1 && item.path == this.$route.path) {
+        return false
+      }
+
       this.$store.commit("removeViewTags", tag)
       this.$store.commit("removeIframeList", tag)
       this.$store.commit("removeKeepLive", tag.name)

package/dist/components/lwLayout/components/userbar.vue

@@ -51,6 +51,7 @@
 import bu from './bu.vue'
 import task from './task.vue'
 import empty from '@/assets/images/empty.jpg'
+import setting from './setting.vue';
 export default {
   props: {
     isShowBu: {
@@ -68,7 +69,8 @@ export default {
   },
   components: {
     bu,
-    task
+    task,
+    setting
   },
   data() {
     return {

package/dist/components/lwLayout/index.vue

@@ -130,7 +130,6 @@ import Topbar from './components/topbar.vue';
 import Tags from './components/tags.vue';
 import NavMenu from './components/NavMenu.vue';
 import userbar from './components/userbar.vue';
-import setting from './components/setting.vue';
 import iframeView from './components/iframeView.vue';
 export default {
   name: 'lwLayout',
@@ -161,7 +160,6 @@ export default {
     Tags,
     NavMenu,
     userbar,
-    setting,
     iframeView
   },
   data() {

package/dist/components/lwTable/index.js

@@ -252,6 +252,7 @@ export default {
 			// 自动计算稿表格高度
 			const container = document.querySelector('.adminui-main > .el-container') || { clientHeight: 0 }
 			const btnContainer = document.querySelector('.table-block > .btn-container')
+			const formTabele = document.querySelector('.el-form-item__content > .lw-table-page')
 			const searchCard = document.querySelector('.lw-search-card')
 			this.tableHeight = container.clientHeight
 
@@ -261,7 +262,13 @@ export default {
 			if (btnContainer) {
 				this.tableHeight = this.tableHeight - btnContainer.clientHeight - 10
 			}
-			this.tableHeight = this.tableHeight - 110
+      
+      if (!formTabele) {
+        this.tableHeight = this.tableHeight - 110
+      } else {
+        this.tableHeight = ''
+      }
+			
 		},
 		// 拖动选中
 		onSelect({ selected }) {

package/dist/components/lwTable/index.scss

@@ -1,5 +1,6 @@
 .lw-table-page {
 	position: relative;
+	width: 100%;
 
 	.icon-more {
 		margin-top: 3px;

package/dist/lw-cdp-ui.esm.js

@@ -485,11 +485,13 @@ const uc = /* @__PURE__ */ ue(ac, [["render", sc], ["__scopeId", "data-v-c198cd7
     },
     //关闭tag
     closeSelectedTag(e, n = !0) {
-      var r;
+      var r, a;
       let t = this.menu[0];
-      if (t.children && (t = t.children[0]), (r = t.meta) != null && r.code && (t.path = `/i/${t.name}`), this.$store.commit("removeViewTags", e), this.$store.commit("removeIframeList", e), this.$store.commit("removeKeepLive", e.name), this.$tool.data.set("RouteTags", this.$store.state.viewTags.viewTags), n && this.isActive(e)) {
-        const a = this.tagList.slice(-1)[0];
-        a ? this.$router.push(a) : this.$router.push({ path: t.path });
+      if (t.children && (t = t.children[0]), (r = t.meta) != null && r.code && ((a = t.meta) == null ? void 0 : a.code) != this.$config.APP_NAME.toLowerCase() && (t.path = `/i/${t.name}`), this.tagList.length == 1 && t.path == this.$route.path)
+        return !1;
+      if (this.$store.commit("removeViewTags", e), this.$store.commit("removeIframeList", e), this.$store.commit("removeKeepLive", e.name), this.$tool.data.set("RouteTags", this.$store.state.viewTags.viewTags), n && this.isActive(e)) {
+        const o = this.tagList.slice(-1)[0];
+        o ? this.$router.push(o) : this.$router.push({ path: t.path });
       }
     },
     //tag右键
@@ -1302,8 +1304,8 @@ const { isFullscreen: ev, toggle: Fc } = kc(), Lc = {
      */
     handleResize() {
       document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement || (this.isFullscreen = !1);
-      const n = document.querySelector(".adminui-main > .el-container") || { clientHeight: 0 }, t = document.querySelector(".table-block > .btn-container"), r = document.querySelector(".lw-search-card");
-      this.tableHeight = n.clientHeight, r && (this.tableHeight = this.tableHeight - r.clientHeight), t && (this.tableHeight = this.tableHeight - t.clientHeight - 10), this.tableHeight = this.tableHeight - 110;
+      const n = document.querySelector(".adminui-main > .el-container") || { clientHeight: 0 }, t = document.querySelector(".table-block > .btn-container"), r = document.querySelector(".el-form-item__content > .lw-table-page"), a = document.querySelector(".lw-search-card");
+      this.tableHeight = n.clientHeight, a && (this.tableHeight = this.tableHeight - a.clientHeight), t && (this.tableHeight = this.tableHeight - t.clientHeight - 10), r ? this.tableHeight = "" : this.tableHeight = this.tableHeight - 110;
     },
     // 拖动选中
     onSelect({ selected: e }) {
@@ -2565,163 +2567,7 @@ function y8(e, n, t, r, a, o) {
     }, 8, ["modelValue"])
   ], 64);
 }
-const C8 = /* @__PURE__ */ ue(g8, [["render", y8], ["__scopeId", "data-v-67b6e19f"]]), b8 = {
-  props: {
-    isShowBu: {
-      type: Boolean,
-      default: !0
-    },
-    isShowTask: {
-      type: Boolean,
-      default: !0
-    },
-    isInitialized: {
-      type: Boolean,
-      default: !0
-    }
-  },
-  components: {
-    bu: vc,
-    task: C8
-  },
-  data() {
-    return {
-      empty: J4,
-      settingDialog: !1,
-      userName: "",
-      userNameF: "",
-      searchVisible: !1,
-      tasksVisible: !1,
-      msg: !1
-    };
-  },
-  created() {
-    this.$store.state.user = this.$tool.data.get("userAuthInfo");
-  },
-  methods: {
-    //个人信息
-    handleUser(e) {
-      e == "setting" && (this.settingDialog = !0), e == "cmd" && this.$router.push({ path: "/cmd" }), e == "clearCache" && this.$confirm("清除缓存会将系统初始化，包括登录状态、主题、语言设置等，是否继续？", "提示", {
-        type: "info"
-      }).then(() => {
-        this.$tool.data.clear(), window.location.href = "/#/passport-login";
-      }).catch(() => {
-      }), e == "outLogin" && this.$confirm("确认是否退出当前用户？", "提示", {
-        type: "warning",
-        confirmButtonText: "退出",
-        confirmButtonClass: "el-button--danger"
-      }).then(() => {
-        this.$store.commit("clearViewTags"), this.$store.commit("clearKeepLive"), this.$store.commit("clearIframeList"), window.location.href = "/#/passport-login";
-      }).catch(() => {
-      });
-    },
-    //全屏
-    screen() {
-      var e = document.documentElement;
-      this.$tool.screen(e);
-    },
-    //显示短消息
-    showMsg() {
-      this.msg = !0;
-    },
-    //搜索
-    search() {
-      this.searchVisible = !0;
-    },
-    //任务
-    tasks() {
-      this.tasksVisible = !0;
-    }
-  }
-}, w8 = { class: "user-bar" }, E8 = { class: "user-avatar" }, _8 = { class: "user-body" }, I8 = { class: "user-name" };
-function B8(e, n, t, r, a, o) {
-  const l = E("task"), i = E("bu"), u = E("el-avatar"), d = E("el-dropdown-item"), f = E("el-dropdown-menu"), h = E("el-dropdown"), b = E("setting"), k = E("el-drawer");
-  return g(), F(P, null, [
-    M("div", w8, [
-      me(e.$slots, "userbarActionBox", {}, void 0, !0),
-      t.isShowTask ? (g(), B(l, { key: 0 })) : Z("", !0),
-      t.isShowBu ? (g(), B(i, {
-        key: 1,
-        isInitialized: t.isInitialized
-      }, null, 8, ["isInitialized"])) : Z("", !0),
-      C(h, {
-        class: "user panel-item",
-        trigger: "click",
-        onCommand: o.handleUser
-      }, {
-        dropdown: v(() => [
-          C(f, null, {
-            default: v(() => [
-              C(d, { command: "uc" }, {
-                default: v(() => [
-                  M("div", _8, [
-                    C(u, {
-                      size: 30,
-                      src: e.$store.state.user.img || a.empty
-                    }, null, 8, ["src"]),
-                    M("div", I8, [
-                      M("label", null, O(e.$store.state.user.realName), 1),
-                      M("label", null, O(e.$store.state.user.username), 1)
-                    ])
-                  ])
-                ]),
-                _: 1
-              }),
-              C(d, {
-                divided: "",
-                command: "setting"
-              }, {
-                default: v(() => [
-                  G(O(e.$t("lwLayout.layout.layoutConfiguration")), 1)
-                ]),
-                _: 1
-              }),
-              C(d, { command: "clearCache" }, {
-                default: v(() => [
-                  G(O(e.$t("lwLayout.layout.clearCache")), 1)
-                ]),
-                _: 1
-              }),
-              C(d, {
-                divided: "",
-                command: "outLogin"
-              }, {
-                default: v(() => [
-                  G(O(e.$t("lwLayout.layout.outLogin")), 1)
-                ]),
-                _: 1
-              })
-            ]),
-            _: 1
-          })
-        ]),
-        default: v(() => [
-          M("div", E8, [
-            C(u, {
-              size: 30,
-              src: e.$store.state.user.img || a.empty
-            }, null, 8, ["src"])
-          ])
-        ]),
-        _: 1
-      }, 8, ["onCommand"])
-    ]),
-    C(k, {
-      title: "布局实时演示",
-      modelValue: a.settingDialog,
-      "onUpdate:modelValue": n[0] || (n[0] = (_) => a.settingDialog = _),
-      size: 400,
-      "append-to-body": "",
-      "destroy-on-close": ""
-    }, {
-      default: v(() => [
-        C(b)
-      ]),
-      _: 1
-    }, 8, ["modelValue"])
-  ], 64);
-}
-const k8 = /* @__PURE__ */ ue(b8, [["render", B8], ["__scopeId", "data-v-5a6e0fc1"]]), Go = {
+const C8 = /* @__PURE__ */ ue(g8, [["render", y8], ["__scopeId", "data-v-67b6e19f"]]), Go = {
   //hex颜色转rgb颜色
   HexToRgb(e) {
     e = e.replace("#", "");
@@ -2748,7 +2594,7 @@ const k8 = /* @__PURE__ */ ue(b8, [["render", B8], ["__scopeId", "data-v-5a6e0fc
     for (let r = 0; r < 3; r++) t[r] = Math.floor((255 - t[r]) * n + t[r]);
     return this.RgbToHex(t[0], t[1], t[2]);
   }
-}, F8 = {
+}, b8 = {
   data() {
     return {
       config: {
@@ -2782,7 +2628,7 @@ const k8 = /* @__PURE__ */ ue(b8, [["render", B8], ["__scopeId", "data-v-5a6e0fc
     }
   }
 };
-function L8(e, n, t, r, a, o) {
+function w8(e, n, t, r, a, o) {
   const l = E("el-button"), i = E("el-dropdown-item"), u = E("el-dropdown-menu"), d = E("el-dropdown");
   return g(), B(d, {
     trigger: "click",
@@ -2837,7 +2683,7 @@ function L8(e, n, t, r, a, o) {
     _: 1
   }, 8, ["onCommand"]);
 }
-const e5 = /* @__PURE__ */ ue(F8, [["render", L8]]), x8 = {
+const e5 = /* @__PURE__ */ ue(b8, [["render", w8]]), E8 = {
   components: { Lang: e5 },
   data() {
     return {
@@ -2872,7 +2718,7 @@ const e5 = /* @__PURE__ */ ue(F8, [["render", L8]]), x8 = {
     }
   }
 };
-function S8(e, n, t, r, a, o) {
+function _8(e, n, t, r, a, o) {
   const l = E("el-divider"), i = E("el-switch"), u = E("el-form-item"), d = E("el-color-picker"), f = E("el-option"), h = E("el-select"), b = E("Lang"), k = E("el-form");
   return g(), B(k, {
     ref: "form",
@@ -2981,7 +2827,164 @@ function S8(e, n, t, r, a, o) {
     _: 1
   }, 512);
 }
-const V8 = /* @__PURE__ */ ue(x8, [["render", S8]]), M8 = {
+const I8 = /* @__PURE__ */ ue(E8, [["render", _8]]), B8 = {
+  props: {
+    isShowBu: {
+      type: Boolean,
+      default: !0
+    },
+    isShowTask: {
+      type: Boolean,
+      default: !0
+    },
+    isInitialized: {
+      type: Boolean,
+      default: !0
+    }
+  },
+  components: {
+    bu: vc,
+    task: C8,
+    setting: I8
+  },
+  data() {
+    return {
+      empty: J4,
+      settingDialog: !1,
+      userName: "",
+      userNameF: "",
+      searchVisible: !1,
+      tasksVisible: !1,
+      msg: !1
+    };
+  },
+  created() {
+    this.$store.state.user = this.$tool.data.get("userAuthInfo");
+  },
+  methods: {
+    //个人信息
+    handleUser(e) {
+      e == "setting" && (this.settingDialog = !0), e == "cmd" && this.$router.push({ path: "/cmd" }), e == "clearCache" && this.$confirm("清除缓存会将系统初始化，包括登录状态、主题、语言设置等，是否继续？", "提示", {
+        type: "info"
+      }).then(() => {
+        this.$tool.data.clear(), window.location.href = "/#/passport-login";
+      }).catch(() => {
+      }), e == "outLogin" && this.$confirm("确认是否退出当前用户？", "提示", {
+        type: "warning",
+        confirmButtonText: "退出",
+        confirmButtonClass: "el-button--danger"
+      }).then(() => {
+        this.$store.commit("clearViewTags"), this.$store.commit("clearKeepLive"), this.$store.commit("clearIframeList"), window.location.href = "/#/passport-login";
+      }).catch(() => {
+      });
+    },
+    //全屏
+    screen() {
+      var e = document.documentElement;
+      this.$tool.screen(e);
+    },
+    //显示短消息
+    showMsg() {
+      this.msg = !0;
+    },
+    //搜索
+    search() {
+      this.searchVisible = !0;
+    },
+    //任务
+    tasks() {
+      this.tasksVisible = !0;
+    }
+  }
+}, k8 = { class: "user-bar" }, F8 = { class: "user-avatar" }, L8 = { class: "user-body" }, x8 = { class: "user-name" };
+function S8(e, n, t, r, a, o) {
+  const l = E("task"), i = E("bu"), u = E("el-avatar"), d = E("el-dropdown-item"), f = E("el-dropdown-menu"), h = E("el-dropdown"), b = E("setting"), k = E("el-drawer");
+  return g(), F(P, null, [
+    M("div", k8, [
+      me(e.$slots, "userbarActionBox", {}, void 0, !0),
+      t.isShowTask ? (g(), B(l, { key: 0 })) : Z("", !0),
+      t.isShowBu ? (g(), B(i, {
+        key: 1,
+        isInitialized: t.isInitialized
+      }, null, 8, ["isInitialized"])) : Z("", !0),
+      C(h, {
+        class: "user panel-item",
+        trigger: "click",
+        onCommand: o.handleUser
+      }, {
+        dropdown: v(() => [
+          C(f, null, {
+            default: v(() => [
+              C(d, { command: "uc" }, {
+                default: v(() => [
+                  M("div", L8, [
+                    C(u, {
+                      size: 30,
+                      src: e.$store.state.user.img || a.empty
+                    }, null, 8, ["src"]),
+                    M("div", x8, [
+                      M("label", null, O(e.$store.state.user.realName), 1),
+                      M("label", null, O(e.$store.state.user.username), 1)
+                    ])
+                  ])
+                ]),
+                _: 1
+              }),
+              C(d, {
+                divided: "",
+                command: "setting"
+              }, {
+                default: v(() => [
+                  G(O(e.$t("lwLayout.layout.layoutConfiguration")), 1)
+                ]),
+                _: 1
+              }),
+              C(d, { command: "clearCache" }, {
+                default: v(() => [
+                  G(O(e.$t("lwLayout.layout.clearCache")), 1)
+                ]),
+                _: 1
+              }),
+              C(d, {
+                divided: "",
+                command: "outLogin"
+              }, {
+                default: v(() => [
+                  G(O(e.$t("lwLayout.layout.outLogin")), 1)
+                ]),
+                _: 1
+              })
+            ]),
+            _: 1
+          })
+        ]),
+        default: v(() => [
+          M("div", F8, [
+            C(u, {
+              size: 30,
+              src: e.$store.state.user.img || a.empty
+            }, null, 8, ["src"])
+          ])
+        ]),
+        _: 1
+      }, 8, ["onCommand"])
+    ]),
+    C(k, {
+      title: "布局实时演示",
+      modelValue: a.settingDialog,
+      "onUpdate:modelValue": n[0] || (n[0] = (_) => a.settingDialog = _),
+      size: 400,
+      "append-to-body": "",
+      "destroy-on-close": ""
+    }, {
+      default: v(() => [
+        C(b)
+      ]),
+      _: 1
+    }, 8, ["modelValue"])
+  ], 64);
+}
+const V8 = /* @__PURE__ */ ue(B8, [["render", S8], ["__scopeId", "data-v-d10d105f"]]), M8 = {
   data() {
     return {};
   },
@@ -3053,8 +3056,7 @@ const P8 = /* @__PURE__ */ ue(M8, [["render", D8], ["__scopeId", "data-v-91dc7bb
     Topbar: uc,
     Tags: pc,
     NavMenu: K4,
-    userbar: k8,
-    setting: V8,
+    userbar: V8,
     iframeView: P8
   },
   data() {