lw-cdp-ui 1.3.42 → 1.3.44

package/dist/components/lwLayout/index.vue

@@ -9,7 +9,12 @@
       <section class="aminui-wrapper">
         <div v-if="!ismobile"
              :class="menuIsCollapse ? 'aminui-side isCollapse' : 'aminui-side'">
-          <div class="aminui-title-name">
+          <div v-if="appName && appSimpleName"
+               class="aminui-title-name">
+            {{ menuIsCollapse ? appSimpleName : appName }}
+          </div>
+          <div v-else
+               class="aminui-title-name">
             {{ menuIsCollapse ? $config.APP_NAME.charAt(0) : $config.APP_NAME }}
           </div>
           <div class="adminui-side-scroll">
@@ -50,8 +55,7 @@
           <div class="adminui-main">
             <slot name="routerView">
               <router-view v-slot="{ Component }">
-                <keep-alive
-                            :include="this.$store.state.keepAlive.keepLiveRoute">
+                <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
                   <component :is="Component"
                              :key="$route.fullPath"
                              v-if="$store.state.keepAlive.routeShow" />
@@ -66,7 +70,7 @@
   </template>
 
   <!-- 默认布局 -->
-  <template v-else>
+  <!-- <template v-else>
     <div class="aminui-body-default">
       <div class="aminui-title-name">
         {{ menuIsCollapse ? $config.APP_NAME.charAt(0) : $config.APP_NAME }}
@@ -119,18 +123,18 @@
         <iframe-view></iframe-view>
       </div>
     </div>
-  </template>
- 
+  </template> -->
+
 </template>
 
 <script>
-import SideM from './components/sideM.vue';
-import Aside from './components/aside.vue';
-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 iframeView from './components/iframeView.vue';
+import SideM from './components/sideM.vue'
+import Aside from './components/aside.vue'
+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 iframeView from './components/iframeView.vue'
 export default {
   name: 'lwLayout',
   props: {
@@ -151,6 +155,16 @@ export default {
     tagShowID: {
       type: Boolean,
       default: false
+    },
+    // 应用名称
+    appName: {
+      type: String,
+      default: ''
+    },
+    // 应用缩写名称
+    appSimpleName: {
+      type: String,
+      default: ''
     }
   },
   components: {
@@ -187,50 +201,48 @@ export default {
   },
   beforeCreate() {
     // 挂载自定义菜单订阅
-    this.$bus.$on('setMenu', (menu) => {
+    this.$bus.$on('setMenu', menu => {
       this.changeMenu = true
       this.menu = this.filterUrl(menu)
     })
 
     // 处理标签状态
-    let isHideTab = this.$tool.data.get("APP_LAYOUTTAGS")
+    let isHideTab = this.$tool.data.get('APP_LAYOUTTAGS')
     if (isHideTab) {
       this.$store.state.global.layoutTags = false
     }
-    let isMenuIsCollapse = this.$tool.data.get("APP_menuIsCollapse")
+    let isMenuIsCollapse = this.$tool.data.get('APP_menuIsCollapse')
     this.$store.state.global.menuIsCollapse = !!isMenuIsCollapse
   },
   async created() {
-    this.onLayoutResize();
-    window.addEventListener('resize', this.onLayoutResize);
-    this.getUserInfo();
+    this.onLayoutResize()
+    window.addEventListener('resize', this.onLayoutResize)
+    this.getUserInfo()
     if (!this.changeMenu) {
-      var menu = this.$router.sc_getMenu();
-      this.menu = this.filterUrl(menu);
+      var menu = this.$router.sc_getMenu()
+      this.menu = this.filterUrl(menu)
     }
     this.showThis()
-    this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE")
+    this.$store.commit('LOAD_USER_FROM_LOCAL_STORAGE')
   },
   watch: {
     async $route() {
       this.showThis()
     },
     '$i18n.locale'() {
-      var menu = this.$router.sc_getMenu();
-      this.menu = this.filterUrl(menu);
+      var menu = this.$router.sc_getMenu()
+      this.menu = this.filterUrl(menu)
     },
     layout: {
       handler(val) {
         document.body.setAttribute('data-layout', val)
       },
-      immediate: true,
-    },
-
+      immediate: true
+    }
   },
   methods: {
     // 获取用户信息 - 用于从demo环境直接跳转
     async getUserInfo() {
-
       // 获取所有bu
       let bu = await this.$api.auth.bu()
       this.$tool.data.set('buList', bu)
@@ -240,60 +252,62 @@ export default {
 
       // 处理应用显示逻辑
       let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
-      user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
+      user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x =>
+        application.includes(x.code)
+      )
 
       let userAuthInfo = {
         ...user.userAuthInfo,
         combined: user.combined,
         loginPage: user.loginPage,
-        menuContent: user.menuContent,
+        menuContent: user.menuContent
       }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
       this.$tool.data.set('userAuthInfo', userAuthInfo)
       this.$store.state.user = userAuthInfo
     },
     onLayoutResize() {
-      this.$store.commit("SET_ismobile", document.body.clientWidth < 992)
+      this.$store.commit('SET_ismobile', document.body.clientWidth < 992)
     },
     //路由监听高亮
     showThis() {
       this.pmenu = this.$route.meta.breadcrumb ? this.$route.meta.breadcrumb[0] : {}
-      this.nextMenu = this.filterUrl(this.pmenu.children);
+      this.nextMenu = this.filterUrl(this.pmenu.children)
       this.$nextTick(() => {
-        this.active = this.$route.meta.active || this.$route.fullPath;
+        this.active = this.$route.meta.active || this.$route.fullPath
       })
     },
     //点击显示
     showMenu(route) {
-      this.pmenu = route;
-      this.nextMenu = this.filterUrl(route.children);
+      this.pmenu = route
+      this.nextMenu = this.filterUrl(route.children)
       if ((!route.children || route.children.length == 0) && route.component) {
-        this.$router.push({ path: route.path })
+        this.$router.push({path: route.path})
       }
     },
     //转换外部链接的路由
     filterUrl(map) {
-
       var newMap = []
-      map && map.forEach(item => {
-        item.meta = item.meta ? item.meta : {};
-        //处理隐藏
-        if (item.meta.hidden || item.meta.type == "button") {
-          return false
-        }
-        //处理http
-        if (item.meta.type == 'iframe') {
-          item.path = `/i/${item.name}`;
-        }
-        //递归循环
-        if (item.children && item.children.length > 0) {
-          item.children = this.filterUrl(item.children)
-        }
-        newMap.push(item)
-      })
+      map &&
+        map.forEach(item => {
+          item.meta = item.meta ? item.meta : {}
+          //处理隐藏
+          if (item.meta.hidden || item.meta.type == 'button') {
+            return false
+          }
+          //处理http
+          if (item.meta.type == 'iframe') {
+            item.path = `/i/${item.name}`
+          }
+          //递归循环
+          if (item.children && item.children.length > 0) {
+            item.children = this.filterUrl(item.children)
+          }
+          newMap.push(item)
+        })
 
       this.changeMenu = false
-      return newMap;
+      return newMap
     }
   }
 }

package/dist/components/lwLayout/init.vue

@@ -16,10 +16,7 @@
       </div>
       <div v-else
            class="table-block">
-        <lwFormMini v-model="dataForm"
-                    ref="dataFormRef"
-                    :config="formConfig">
-        </lwFormMini>
+        <slot></slot>
       </div>
 
     </el-main>
@@ -34,11 +31,8 @@
 </template>
 
 <script>
+import {ref} from 'vue'
 import empty from '@/assets/images/empty.jpg'
-import {getCurrentInstance, ref, toRefs, computed} from 'vue'
-import dayjs from 'dayjs'
-import {ElMessage} from 'element-plus'
-import {useRouter} from 'vue-router'
 import bu from './components/bu'
 
 export default {
@@ -46,182 +40,18 @@ export default {
   components: {
     bu
   },
-  props: {
-    typeList: {
-      type: Array,
-      default: () => {
-        return [
-          {value: 'nfs', label: '本地硬盘'},
-          {value: 'aws', label: '亚马逊云'},
-          {value: 'oss', label: '阿里云'},
-          {value: 'minio', label: 'MinIO'}
-        ]
-      }
-    },
-    config: {
-      type: Object,
-      default: null
-    }
-  },
-  setup(props) {
-    const {
-      proxy: {$api, $expression, t, $tool, $bus}
-    } = getCurrentInstance()
-    const router = useRouter()
-
+  props: {},
+  emits: ['save'],
+  setup(props, { emit }) {
     const startInit = ref(true)
-    const dataForm = ref({})
-    const dataFormRef = ref(null)
-    const formConfig = computed(() => {
-      return (
-        props?.config || {
-          labelWidth: '110px',
-          labelPosition: 'top',
-          formItems: [
-            {label: '基础设置', component: 'divider'},
-            {
-              label: '名称',
-              name: 'name',
-              value: '',
-              component: 'input',
-              span: 24,
-              options: {
-                maxlength: '20',
-                placeholder: '请输入'
-              },
-              rules: [{required: true, message: '请输入', trigger: 'blur'}]
-            },
-            {label: '存储上传设置', component: 'divider'},
-            {
-              label: 'OLTP类型',
-              name: 'setting.persistent.oltp.type',
-              value: '',
-              component: 'select',
-              span: 12,
-              options: {
-                items: props.typeList,
-                placeholder: '请选择'
-              },
-              rules: [{required: true, message: '请选择', trigger: 'blur'}]
-            },
-            {
-              label: 'OLTP是否启用',
-              name: 'setting.persistent.oltp.zoned',
-              value: true,
-              component: 'switch',
-              span: 12
-            },
-            {
-              label: 'OLAP类型',
-              name: 'setting.persistent.olap.type',
-              value: '',
-              component: 'select',
-              span: 12,
-              options: {
-                items: props.typeList,
-                placeholder: '请选择'
-              },
-              rules: [{required: true, message: '请选择', trigger: 'blur'}]
-            },
-            {
-              label: 'OLAP是否启用',
-              name: 'setting.persistent.olap.zoned',
-              value: true,
-              component: 'switch',
-              span: 12
-            },
-            {
-              label: 'LAKE类型',
-              name: 'setting.persistent.lake.type',
-              value: '',
-              component: 'select',
-              span: 12,
-              options: {
-                items: props.typeList,
-                placeholder: '请选择'
-              },
-              rules: [{required: true, message: '请选择', trigger: 'blur'}]
-            },
-            {
-              label: 'LAKE是否启用',
-              name: 'setting.persistent.lake.zoned',
-              value: true,
-              component: 'switch',
-              span: 12
-            },
-            {label: 'LAKE配置', component: 'divider', hideHandle: '!$.setting.persistent.lake.zoned'},
-            {
-              label: 'endpoint',
-              name: 'setting.persistent.lake.endpoint',
-              value: '',
-              component: 'input',
-              span: 12,
-              options: {
-                placeholder: '请输入'
-              },
-              hideHandle: '!$.setting.persistent.lake.zoned',
-              rules: [{required: true, message: '请输入', trigger: 'blur'}]
-            },
-            {
-              label: 'accessKey',
-              name: 'setting.persistent.lake.accessKey',
-              value: '',
-              component: 'input',
-              span: 12,
-              options: {
-                placeholder: '请输入'
-              },
-              hideHandle: '!$.setting.persistent.lake.zoned',
-              rules: [{required: true, message: '请输入', trigger: 'blur'}]
-            },
-            {
-              label: 'secretKey',
-              name: 'setting.persistent.lake.secretKey',
-              value: '',
-              component: 'input',
-              span: 12,
-              options: {
-                placeholder: '请输入'
-              },
-              hideHandle: '!$.setting.persistent.lake.zoned',
-              rules: [{required: true, message: '请输入', trigger: 'blur'}]
-            },
-            {
-              label: 'location',
-              name: 'setting.persistent.lake.location',
-              value: '',
-              component: 'input',
-              span: 12,
-              options: {
-                placeholder: '请输入'
-              },
-              hideHandle: '!$.setting.persistent.lake.zoned',
-              rules: [{required: true, message: '请输入', trigger: 'blur'}]
-            }
-          ]
-        }
-      )
-    })
-
     const save = () => {
-      dataFormRef.value.validate((valid, obj) => {
-        if (valid) {
-          $api.auth.setInitialized(dataForm.value).then(() => {
-            ElMessage.success('初始化成功！')
-            $tool.data.set('zoneInitialized', 'true')
-            router.push('/')
-          })
-        }
-      })
+      emit('save')
     }
 
     return {
-      save,
-      empty,
       startInit,
-      dataFormRef,
-      formConfig,
-      dataForm
+      save,
+      empty
     }
   }
 }