lw-cdp-ui 1.3.6 → 1.3.8

package/dist/components/lwLayout/components/setting.vue

@@ -5,18 +5,18 @@
            style="padding:0 20px;">
     <!-- <el-alert title="以下配置可实时预览，开发者可在 config/index.js 中配置默认值，非常不建议在生产环境下开放布局设置" type="error" :closable="false"></el-alert> -->
     <el-divider></el-divider>
-    <el-form-item :label="$t('user.nightmode')">
+    <el-form-item :label="$t('lwLayout.user.nightmode')">
       <el-switch v-model="dark"
                  active-value="dark"
                  inactive-value="default"></el-switch>
     </el-form-item>
     <el-divider></el-divider>
-    <el-form-item :label="$t('user.color')">
+    <el-form-item :label="$t('lwLayout.user.color')">
       <el-color-picker v-model="colorPrimary"
                        :predefine="colorList">></el-color-picker>
     </el-form-item>
     <el-divider></el-divider>
-    <el-form-item :label="$t('user.layout')">
+    <el-form-item :label="$t('lwLayout.user.layout')">
       <el-select v-model="layout"
                  placeholder="请选择">
         <el-option label="默认"
@@ -29,14 +29,14 @@
                    value="dock"></el-option>
       </el-select>
     </el-form-item>
-    <el-form-item :label="$t('user.menu')">
+    <el-form-item :label="$t('lwLayout.user.menu')">
       <el-switch v-model="menuIsCollapse"></el-switch>
     </el-form-item>
-    <el-form-item :label="$t('user.tag')">
+    <el-form-item :label="$t('lwLayout.user.tag')">
       <el-switch v-model="layoutTags"></el-switch>
     </el-form-item>
     <el-divider></el-divider>
-    <el-form-item :label="$t('user.lang')">
+    <el-form-item :label="$t('lwLayout.user.lang')">
       <Lang />
     </el-form-item>
 

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

@@ -27,23 +27,31 @@
               </div>
             </div>
           </el-dropdown-item>
-          <!-- <el-dropdown-item command="uc"
-                            divided>{{$t('layout.userData')}}</el-dropdown-item> -->
+          <el-dropdown-item divided
+                            command="setting">{{$t('lwLayout.layout.layoutConfiguration')}}</el-dropdown-item>
           <el-dropdown-item
-                            command="clearCache">{{$t('layout.clearCache')}}</el-dropdown-item>
+                            command="clearCache">{{$t('lwLayout.layout.clearCache')}}</el-dropdown-item>
           <el-dropdown-item divided
-                            command="outLogin">{{$t('layout.outLogin')}}</el-dropdown-item>
+                            command="outLogin">{{$t('lwLayout.layout.outLogin')}}</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
   </div>
 
+  <el-drawer title="布局实时演示"
+             v-model="settingDialog"
+             :size="400"
+             append-to-body
+             destroy-on-close>
+    <setting></setting>
+  </el-drawer>
 </template>
 
 <script>
 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: {
@@ -61,11 +69,13 @@ export default {
   },
   components: {
     bu,
-    task
+    task,
+    setting
   },
   data() {
     return {
       empty,
+      settingDialog: false,
       userName: "",
       userNameF: "",
       searchVisible: false,
@@ -80,8 +90,8 @@ export default {
   methods: {
     //个人信息
     handleUser(command) {
-      if (command == "uc") {
-        this.$router.push({ path: '/user' });
+      if (command == "setting") {
+        this.settingDialog = true;
       }
       if (command == "cmd") {
         this.$router.push({ path: '/cmd' });
@@ -212,7 +222,7 @@ export default {
   display: flex;
   align-items: center;
   gap: 20px;
-  width: 150px;
+  min-width: 100px;
   :deep(.el-avatar) {
     min-width: 30px;
   }

package/dist/components/lwLayout/index.vue

@@ -120,17 +120,7 @@
       </div>
     </div>
   </template>
-  <!-- 设置 -->
-  <div class="layout-setting"
-       @click="openSetting"><el-icon><el-icon-brush-filled /></el-icon></div>
-
-  <el-drawer title="布局实时演示"
-             v-model="settingDialog"
-             :size="400"
-             append-to-body
-             destroy-on-close>
-    <setting></setting>
-  </el-drawer>
+ 
 </template>
 
 <script>
@@ -140,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',
@@ -171,12 +160,10 @@ export default {
     Tags,
     NavMenu,
     userbar,
-    setting,
     iframeView
   },
   data() {
     return {
-      settingDialog: false,
       changeMenu: false,
       menu: [],
       nextMenu: [],
@@ -265,12 +252,6 @@ export default {
       this.$tool.data.set('userAuthInfo', userAuthInfo)
       this.$store.state.user = userAuthInfo
     },
-
-
-
-    openSetting() {
-      this.settingDialog = true;
-    },
     onLayoutResize() {
       this.$store.commit("SET_ismobile", document.body.clientWidth < 992)
     },

package/dist/components/lwLayout/locale/en-us.js

@@ -1,20 +1,23 @@
 export default {
-	user: {
-		settings: 'Settings',
-		nightmode: 'Night Mode',
-		color: 'Theme Color',
-		layout: 'Layout',
-		menu: 'Collapse Menu',
-		tag: 'Tag Bar',
-		lang: 'Internationalization',
-		nightmode_msg: 'Suitable for low-light environments; the current dark mode is in beta.',
-		language: 'Language',
-		language_msg: 'Translation in progress; only the text of this view has been translated.'
-	},
-	layout: {
-		topbar: 'Location',
-		userData: 'User Center',
-		outLogin: 'Logout',
-		clearCache: 'Clear Cache'
+	lwLayout: {
+		user: {
+			settings: 'Settings',
+			nightmode: 'Night Mode',
+			color: 'Theme Color',
+			layout: 'Layout',
+			menu: 'Collapse Menu',
+			tag: 'Tag Bar',
+			lang: 'Internationalization',
+			nightmode_msg: 'Suitable for low-light environments; the current dark mode is in beta.',
+			language: 'Language',
+			language_msg: 'Translation in progress; only the text of this view has been translated.'
+		},
+		layout: {
+			layoutConfiguration: 'Layout Configuration',
+			topbar: 'Location',
+			userData: 'User Center',
+			outLogin: 'Logout',
+			clearCache: 'Clear Cache'
+		}
 	}
 }

package/dist/components/lwLayout/locale/zh-cn.js

@@ -1,20 +1,24 @@
 export default {
-	user: {
-		settings: '设置',
-		nightmode: '黑夜模式',
-		color: '主题颜色',
-		layout: '框架布局',
-		menu: '折叠菜单',
-		tag: '标签栏',
-		lang: '国际化',
-		nightmode_msg: '适合光线较弱的环境，当前黑暗模式为beta版本',
-		language: '语言',
-		language_msg: '翻译进行中，暂翻译了本视图的文本'
-	},
-	layout: {
-		topbar: '所在位置',
-		userData: '个人中心',
-		outLogin: '退出登录',
-		clearCache: '清除缓存'
+	lwLayout: {
+		user: {
+			settings: '设置',
+			nightmode: '黑夜模式',
+			color: '主题颜色',
+			layout: '框架布局',
+			menu: '折叠菜单',
+			tag: '标签栏',
+			lang: '国际化',
+
+			nightmode_msg: '适合光线较弱的环境，当前黑暗模式为beta版本',
+			language: '语言',
+			language_msg: '翻译进行中，暂翻译了本视图的文本'
+		},
+		layout: {
+			layoutConfiguration: '布局配置',
+			topbar: '所在位置',
+			userData: '个人中心',
+			outLogin: '退出登录',
+			clearCache: '清除缓存'
+		}
 	}
 }

package/dist/components/lwTable/index.js

@@ -41,7 +41,7 @@ export default {
 		defaultExpandAll: { type: Boolean, default: false }, // 是否默认展开所有行
 		virtualListProps: { type: Object, default: undefined }, // 虚拟滚动配置
 		summaryMethod: { type: Function, default: () => [] }, // 自定义合计方法
-		hideTool: { type: Boolean, default: true }, // 是否隐藏工具栏
+		hideTool: { type: Boolean, default: false }, // 是否隐藏工具栏
 		hideCard: { type: Boolean, default: true }, // 是否显示卡片
 		isSetting: { type: Boolean, default: false }, // 是否显示列设置
 		saveKey: { type: String, default: '' }, // 本地存储 key，用于保存表格配置
@@ -252,16 +252,23 @@ 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
-			console.log(btnContainer, searchCard)
+
 			if (searchCard) {
 				this.tableHeight = this.tableHeight - searchCard.clientHeight
 			}
 			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;