lw-cdp-ui 1.4.18 → 1.4.20

package/dist/components/lwFormMini/ViewItem.vue

@@ -1,14 +1,15 @@
 <template>
   <!-- 间隔标题 -->
-  <div v-if="item.component == 'divider'"
-       class="title-name title-name-divider"
-       :id="'divider-' + item.label"
-       :data-index="item.label">
+  <div
+    v-if="item.component == 'divider'"
+    class="title-name title-name-divider"
+    :id="'divider-' + item.label"
+    :data-index="item.label">
     <span>
       {{ item.label }}
       <el-tooltip v-if="item.tips">
         <template #content>
-          <span style="max-width: 300px; display: inline-block;">
+          <span style="max-width: 300px; display: inline-block">
             {{ item.tips }}
           </span>
         </template>
@@ -16,61 +17,54 @@
       </el-tooltip>
     </span>
     <slot :name="item?.options?.component"></slot>
-
   </div>
 
   <!-- 表单内容 -->
-  <el-form-item v-else
-                :class="{ 'form-item-name-null': !item?.label }"
-                :prop="getPropName(item)"
-                :rules="rulesHandle(item)">
+  <el-form-item
+    v-else
+    :class="{ 'form-item-name-null': !item?.label }"
+    :prop="getPropName(item)"
+    :rules="rulesHandle(item)">
     <template #label>
       {{ item.label }}
-      <el-tooltip v-if="item.tips"
-                  :raw-content="item?.rawContent"
-                  :content="item.tips">
+      <el-tooltip v-if="item.tips" :raw-content="item?.rawContent" :content="item.tips">
         <el-icon><el-icon-question-filled /></el-icon>
       </el-tooltip>
     </template>
 
     <!-- input -->
     <template v-if="item.component == 'input'">
-      <template
-                v-if="item?.options?.prepend">{{ item?.options.prepend }}</template>
-      <textToPassword v-model="objItem.value"
-                      :password="item?.options?.password" />
-      <template
-                v-if="item?.options?.append">{{ item?.options.append }}</template>
-
+      <template v-if="item?.options?.prepend">{{ item?.options.prepend }}</template>
+      <textToPassword v-model="objItem.value" :password="item?.options?.password" />
+      <template v-if="item?.options?.append">{{ item?.options.append }}</template>
     </template>
     <!-- upload -->
     <template v-else-if="item.component == 'upload'">
-      <template v-for="(_item, _index) in objItem?.options.items"
-                :key="_index">
-        <lw-upload v-model="_item.value"
-                   :height="item.height"
-                   :width="item.width"
-                   :maxSize="_item.maxSize"
-                   :accept="_item.accept"
-                   :title="_item.label"
-                   :parseData="item.parseData"
-                   :disabled="true"
-                   :multiple="_item?.multiple"
-                   :limit="_item?.limit"
-                   :returnFile="_item?.returnFile"
-                   :tip="_item?.tip"
-                   :apiObj="item.apiObj"></lw-upload>
-
+      <template v-for="(_item, _index) in objItem?.options.items" :key="_index">
+        <lw-upload
+          v-model="_item.value"
+          :height="item.height"
+          :width="item.width"
+          :maxSize="_item.maxSize"
+          :accept="_item.accept"
+          :title="_item.label"
+          :parseData="item.parseData"
+          :disabled="true"
+          :multiple="_item?.multiple"
+          :limit="_item?.limit"
+          :returnFile="_item?.returnFile"
+          :tip="_item?.tip"
+          :apiObj="item.apiObj"></lw-upload>
       </template>
     </template>
     <!-- checkbox -->
     <template v-else-if="item.component == 'checkbox'">
-      <template v-for="(_item, _index) in objItem?.options.items"
-                :key="_index">{{ getKeyToLabel(_item.value, objItem?.options.items) }}</template>
+      <template v-for="(_item, _index) in objItem?.options.items" :key="_index">
+        {{ getKeyToLabel(_item.value, objItem?.options.items) }}
+      </template>
     </template>
     <!-- checkboxGroup 、select、radio -->
-    <template
-              v-else-if="item.component == 'checkboxGroup' || item.component == 'select' || item.component == 'radio'">
+    <template v-else-if="item.component == 'checkboxGroup' || item.component == 'select' || item.component == 'radio'">
       {{ getKeyToLabel(objItem.value, item?.options) }}
     </template>
 
@@ -80,24 +74,11 @@
     </template>
     <!-- treeSelect -->
     <template v-else-if="item.component == 'treeSelect'">
-      <el-tree-select v-model="objItem.value"
-                      :props="item?.options?.props"
-                      disabled
-                      :node-Key="item?.options?.nodeKey"
-                      :multiple="item?.options?.multiple"
-                      :check-Strictly="item?.options?.checkStrictly"
-                      :data="item?.options?.items"></el-tree-select>
-
+      {{ getLabelByValue(item.options.items, objItem.value, item.options.props) }}
     </template>
     <!-- cascader -->
     <template v-else-if="item.component == 'cascader'">
-      <el-cascader v-model="objItem.value"
-                   style="width: 100%;"
-                   :props="item?.options?.props"
-                   :separator="item?.options?.separator"
-                   disabled
-                   :options="item?.options.items"
-                   clearable></el-cascader>
+      {{ getCascaderLabel(item.options.items, objItem.value, item.options.props) }}
     </template>
     <!-- date -->
     <template v-else-if="item.component == 'date'">
@@ -105,7 +86,13 @@
         {{ dayjs(objItem.value).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') }}
       </template>
       <template v-if="typeof objItem.value == 'object'">
-        {{ objItem.value.length > 0 ? dayjs(objItem.value[0]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') + ' - ' + dayjs(objItem.value[1]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') : '--' }}
+        {{
+          objItem.value.length > 0
+            ? dayjs(objItem.value[0]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') +
+              ' - ' +
+              dayjs(objItem.value[1]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss')
+            : '--'
+        }}
       </template>
     </template>
     <!-- number -->
@@ -117,27 +104,21 @@
     </template>
     <!-- color -->
     <template v-else-if="item.component == 'color'">
-      <el-color-picker v-model="objItem.value"
-                       disabled />
+      <el-color-picker v-model="objItem.value" disabled />
     </template>
     <!-- rate -->
     <template v-else-if="item.component == 'rate'">
-      <el-rate style="margin-top: 6px;"
-               v-model="objItem.value"
-               disabled></el-rate>
+      <el-rate style="margin-top: 6px" v-model="objItem.value" disabled></el-rate>
     </template>
     <!-- slider -->
     <template v-else-if="item.component == 'slider'">
-      <el-slider v-model="objItem.value"
-                 :marks="item?.options.marks"
-                 disabled></el-slider>
+      <el-slider v-model="objItem.value" :marks="item?.options.marks" disabled></el-slider>
     </template>
 
     <!-- tags -->
     <template v-else-if="item.component == 'tags'">
       <div class="tags-list">
-        <el-tag v-for="tag in objItem.value"
-                :key="tag">
+        <el-tag v-for="tag in objItem.value" :key="tag">
           {{ tag }}
         </el-tag>
       </div>
@@ -145,15 +126,11 @@
 
     <!-- 没有组件是component值 就是插槽名称 -->
     <template v-else>
-      <slot :name="item.component"
-            :itemCur="item"
-            :formCur="form">
-        <el-tag type="danger">[{{ item.component }}]
-          没有这个默认组件也未自定义插槽内容</el-tag>
+      <slot :name="item.component" :itemCur="item" :formCur="form">
+        <el-tag type="danger">[{{ item.component }}] 没有这个默认组件也未自定义插槽内容</el-tag>
       </slot>
     </template>
-    <div v-if="item.message"
-         class="el-form-item-msg">{{ item.message }}</div>
+    <div v-if="item.message" class="el-form-item-msg">{{ item.message }}</div>
   </el-form-item>
 </template>
 
@@ -178,7 +155,7 @@ export default {
   props: {
     item: {
       type: Object,
-      default: () => { }
+      default: () => {}
     },
     index: {
       type: Number,
@@ -186,7 +163,7 @@ export default {
     },
     form: {
       type: Object,
-      default: () => { }
+      default: () => {}
     }
   },
   watch: {
@@ -202,11 +179,10 @@ export default {
         if (this.item.component === 'checkbox' || this.item.component === 'upload') {
           this.objItem.options?.items?.forEach((option) => {
             option.value = this.flattenObject(this.form, option.name, option.value)
-          });
+          })
         } else {
           this.objItem.value = this.flattenObject(this.form, this.item.name, this.objItem.value)
         }
-
       },
       immediate: true,
       deep: true
@@ -216,48 +192,52 @@ export default {
         if (val.component === 'checkbox' || val.component === 'upload') {
           val.options?.items?.forEach((option) => {
             this.unflattenObject(this.form, option.name, option.value)
-          });
+          })
         } else {
           this.unflattenObject(this.form, val.name, val.value)
         }
       },
       deep: true
-    },
+    }
   },
   methods: {
+    dayjs: dayjs,
     flattenObject(obj, key, defaultValue = '') {
-      if (!key || !obj) { return false }
-      const keys = key.split('.');  // 将路径拆分成数组
+      if (!key || !obj) {
+        return false
+      }
+      const keys = key.split('.') // 将路径拆分成数组
 
-      let current = obj;
+      let current = obj
       // 遍历路径并逐层查找
       for (let i = 0; i < keys.length; i++) {
         // 如果当前层级不存在，则创建该层级对象
         if (current[keys[i]] === undefined) {
-          current[keys[i]] = (i === keys.length - 1) ? defaultValue : {};  // 如果是最后一个层级，设为默认值，否则创建空对象
+          current[keys[i]] = i === keys.length - 1 ? defaultValue : {} // 如果是最后一个层级，设为默认值，否则创建空对象
         }
         // 否则，继续向下查找
-        current = current[keys[i]];
+        current = current[keys[i]]
       }
-      return current;
+      return current
     },
     unflattenObject(obj, path, value) {
-      if (!path || !obj) { return false }
-      const keys = path.split('.'); // 按点分隔路径
+      if (!path || !obj) {
+        return false
+      }
+      const keys = path.split('.') // 按点分隔路径
 
       keys.forEach((key, index) => {
         if (index === keys.length - 1) {
           // 最后一级，直接赋值
-          obj[key] = value;
+          obj[key] = value
         } else {
           // 如果不存在该层级，创建空对象
           if (!obj[key] || typeof obj[key] !== 'object') {
-            obj[key] = {};
+            obj[key] = {}
           }
-          obj = obj[key]; // 进入下一层
+          obj = obj[key] // 进入下一层
         }
-      });
-
+      })
     },
     // prop NAME
     getPropName(item) {
@@ -271,33 +251,72 @@ export default {
     rulesHandle(item) {
       if (item.requiredHandle) {
         try {
-          const requiredHandleFunc = new Function("form", `return ${item.requiredHandle.replace(/\$/g, "form")}`);
-          const exp = requiredHandleFunc(this.form);
+          const requiredHandleFunc = new Function('form', `return ${item.requiredHandle.replace(/\$/g, 'form')}`)
+          const exp = requiredHandleFunc(this.form)
 
-          const requiredRule = item.rules.find(t => 'required' in t);
+          const requiredRule = item.rules.find((t) => 'required' in t)
           if (requiredRule) {
-            requiredRule.required = exp;
+            requiredRule.required = exp
           }
         } catch (error) {
-          console.error("Error requiredHandle function:", error);
+          console.error('Error requiredHandle function:', error)
         }
       }
-      return item.rules;
+      return item.rules
     },
     // key to label
     getKeyToLabel(val, options = {}) {
       if (!options?.multiple) {
         val = [val]
       }
-      let items = options.items.filter(item => { return val.includes(item.value) })
-      return items?.map(item => item.label).join('、') || val || '--'
+      let items = options.items.filter((item) => {
+        return val.includes(item.value)
+      })
+      return items?.map((item) => item.label).join('、') || val || '--'
     },
-    dayjs: dayjs
+    // 根据 value 从树形数据中查找 label（支持自定义 props）
+    getLabelByValue(data, value, props = {}) {
+      const {
+        value: valueKey = 'value', // 默认字段名：value
+        label: labelKey = 'label', // 默认字段名：label
+        children: childrenKey = 'children' // 默认字段名：children
+      } = props
+
+      const findNode = (nodes) => {
+        for (const node of nodes) {
+          if (node[valueKey] === value) return node[labelKey]
+          if (node[childrenKey]) {
+            const result = findNode(node[childrenKey])
+            if (result) return result
+          }
+        }
+        return '--' // 未匹配时显示占位符
+      }
+
+      return findNode(data)
+    },
+    // 获取级联数据的完整路径标签（如 "浙江 / 杭州 / 西湖"）
+    getCascaderLabel(data, value, props = {}) {
+      const { value: valueKey = 'value', label: labelKey = 'label', children: childrenKey = 'children' } = props
+
+      const findPath = (nodes, target, path = []) => {
+        for (const node of nodes) {
+          if (node[valueKey] === target) return [...path, node[labelKey]]
+          if (node[childrenKey]) {
+            const result = findPath(node[childrenKey], target, [...path, node[labelKey]])
+            if (result) return result
+          }
+        }
+        return []
+      }
+
+      const labels = findPath(data, value)
+      return labels.join(' / ') || '--'
+    }
   }
 }
 </script>
 
-
 <style lang="scss" scoped>
 .w-20 {
   width: 100px;
@@ -313,8 +332,9 @@ export default {
   & + .button-new-tag {
     margin-left: 10px;
   }
+
   & + .w-20 {
     margin-left: 10px;
   }
 }
-</style>
+</style>

package/dist/components/lwLayout/components/aside.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout-aside">
 
-    <slot name="logo">
+    <slot name="logo" v-if="unPassport">
       <img class="logo" src="../../../assets/images/logo.svg" alt="" @click="openMneu">
     </slot>
 
@@ -38,6 +38,11 @@
 export default {
   name: 'layoutAside',
   props: {
+    // 不是passport
+    unPassport: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {

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

@@ -116,15 +116,16 @@ export default {
     window.addEventListener('resize', () => {
       this.changeLeftRight()
     })
-  },
-  mounted() {
-    this.scrollInit()
+
 
     // 判断是否有指引组件
     this.$bus.$on(`lwTourOpen`, (val) => {
       this.isOpenTour = val
     })
   },
+  mounted() {
+    this.scrollInit()
+  },
   methods: {
     // 初始化
     init() {

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

@@ -1,48 +1,39 @@
 <template>
   <div class="user-bar">
-    <slot name="userbarActionBox"></slot>
-    <!-- 任务中心 -->
-    <task v-if="isShowTask" />
+    <template v-if="unPassport">
+      <slot name="userbarActionBox"></slot>
+      <!-- 任务中心 -->
+      <task v-if="isShowTask" />
 
-    <!-- 下拉BU -->
-    <bu v-if="isShowBu"
-        :isInitialized="isInitialized" />
+      <!-- 下拉BU -->
+      <bu v-if="isShowBu" :isInitialized="isInitialized" />
+    </template>
 
-    <el-dropdown class="user panel-item"
-                 trigger="click"
-                 @command="handleUser">
+
+    <el-dropdown class="user panel-item" trigger="click" @command="handleUser">
       <div class="user-avatar">
-        <el-avatar :size="30"
-                   :src="$store.state.user.img || empty"></el-avatar>
+        <el-avatar :size="30" :src="$store.state.user.img || empty"></el-avatar>
       </div>
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item command="uc">
             <div class="user-body">
-              <el-avatar :size="30"
-                         :src="$store.state.user.img || empty"></el-avatar>
+              <el-avatar :size="30" :src="$store.state.user.img || empty"></el-avatar>
               <div class="user-name">
                 <label>{{ $store.state.user.realName }}</label>
                 <label>{{ $store.state.user.username }}</label>
               </div>
             </div>
           </el-dropdown-item>
-          <el-dropdown-item divided
-                            command="setting">{{$t('lwLayout.layout.layoutConfiguration')}}</el-dropdown-item>
-          <el-dropdown-item
-                            command="clearCache">{{$t('lwLayout.layout.clearCache')}}</el-dropdown-item>
-          <el-dropdown-item divided
-                            command="outLogin">{{$t('lwLayout.layout.outLogin')}}</el-dropdown-item>
+          <el-dropdown-item divided command="setting">{{ $t('lwLayout.layout.layoutConfiguration') }}</el-dropdown-item>
+          <el-dropdown-item command="clearCache">{{ $t('lwLayout.layout.clearCache') }}</el-dropdown-item>
+          <el-dropdown-item divided 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>
+  <el-drawer title="布局实时演示" v-model="settingDialog" :size="400" append-to-body destroy-on-close>
     <setting></setting>
   </el-drawer>
 </template>
@@ -66,6 +57,11 @@ export default {
       type: Boolean,
       default: true
     },
+    // 不是passport
+    unPassport: {
+      type: Boolean,
+      default: true
+    },
   },
   components: {
     bu,
@@ -149,6 +145,7 @@ export default {
   align-items: center;
   height: 100%;
 }
+
 .user-bar .panel-item {
   padding: 0 10px;
   cursor: pointer;
@@ -156,17 +153,21 @@ export default {
   display: flex;
   align-items: center;
 }
+
 .user-bar .panel-item i {
   font-size: 16px;
 }
+
 .user-bar .panel-item:hover {
   background: rgba(0, 0, 0, 0.1);
 }
+
 .user-bar .user-avatar {
   height: 49px;
   display: flex;
   align-items: center;
 }
+
 .user-bar .user-avatar label {
   display: inline-block;
   margin-left: 5px;
@@ -177,31 +178,38 @@ export default {
 .msg-list li {
   border-top: 1px solid #eee;
 }
+
 .msg-list li a {
   display: flex;
   padding: 20px;
 }
+
 .msg-list li a:hover {
   background: #ecf5ff;
 }
+
 .msg-list__icon {
   width: 40px;
   margin-right: 15px;
 }
+
 .msg-list__main {
   flex: 1;
 }
+
 .msg-list__main h2 {
   font-size: 15px;
   font-weight: normal;
   color: #333;
 }
+
 .msg-list__main p {
   font-size: 12px;
   color: #999;
   line-height: 1.8;
   margin-top: 5px;
 }
+
 .msg-list__time {
   width: 100px;
   text-align: right;
@@ -211,9 +219,11 @@ export default {
 .dark .msg-list__main h2 {
   color: #d0d0d0;
 }
+
 .dark .msg-list li {
   border-top: 1px solid #363636;
 }
+
 .dark .msg-list li a:hover {
   background: #383838;
 }
@@ -223,9 +233,11 @@ export default {
   align-items: center;
   gap: 20px;
   min-width: 100px;
+
   :deep(.el-avatar) {
     min-width: 30px;
   }
+
   .user-name {
     display: flex;
     flex-direction: column;