lw-cdp-ui 1.3.18 → 1.3.20

package/dist/components/lwFlow/index.vue

@@ -357,7 +357,6 @@ export default {
       // 1. 创建所有节点
       nodeData.forEach(item => {
         const node = generateNode(item);
-        item.id = node.id; // 将生成的ID回填到原始数据
         nodes.push(node);
         nodeMap[node.id] = node; // 按节点ID存储
 

package/dist/components/lwFlow/nodes/et2lTableGroup.js

@@ -172,14 +172,13 @@ export default function registerEt2l(lf, node, dynamicGroup) {
 		class HtmlNodeModelAttributes extends dynamicGroup.model {
 			// 监听分组状态变化
 			toggleCollapse(value) {
-				console.log(value)
 				super.toggleCollapse(value)
 			}
 			// 计算子装载节点画布大小
 			async getChildSize() {
 				let children = Array.from(this.children)
 				let nodes = [...this.graphModel.nodes].filter((node) => children.includes(node.id))
-        console.log(nodes)
+ 
 				if (nodes.length === 0) {
 					return { width: 300, height: 240 } // 默认展开大小
 				}

package/dist/components/lwFormMini/ViewItem.vue

@@ -2,8 +2,8 @@
   <!-- 间隔标题 -->
   <div v-if="item.component == 'divider'"
        class="title-name title-name-divider"
-       :id="'divider-' + index"
-       :data-index="index">
+       :id="'divider-' + item.label"
+       :data-index="item.label">
     <span>
       {{ item.label }}
       <el-tooltip v-if="item.tips">
@@ -289,7 +289,7 @@ export default {
       if (!options?.multiple) {
         val = [val]
       }
-      let items = options.items.filter(item => { return val.includes(item.value)  })
+      let items = options.items.filter(item => { return val.includes(item.value) })
       return items?.map(item => item.label).join('、') || val || '--'
     },
     dayjs: dayjs

package/dist/components/lwFormMini/index.vue

@@ -313,13 +313,23 @@ export default {
       this.$emit("submit", this.form)
     },
     clickAffix(index) {
-      this.affixIndex = index
-      const targetElement = document.getElementById('divider-' + index)
-      if (targetElement) {
-        targetElement.scrollIntoView({
-          behavior: 'smooth', // 实现平滑滚动
-          block: 'start' // 保证滚动时目标元素的顶部对齐窗口顶部
-        })
+      this.affixIndex = index;
+      const targetElement = document.getElementById('divider-' + index);
+      const scrollContainer = document.querySelector('.el-container > .el-main');
+
+      if (targetElement && scrollContainer) {
+        const offset = 85; // 目标元素与顶部的偏移量
+        const targetRect = targetElement.getBoundingClientRect();
+        const containerRect = scrollContainer.getBoundingClientRect();
+
+        // 计算目标元素相对于滚动容器内部的真实偏移量
+        const elementPosition = targetRect.top - containerRect.top + scrollContainer.scrollTop;
+
+        // 让 el-main 滚动到目标元素，保证它距离顶部 30px
+        scrollContainer.scrollTo({
+          top: elementPosition - offset,
+          behavior: 'smooth'
+        });
       }
 
       this.scrollObserverEnabled = false;
@@ -329,29 +339,38 @@ export default {
     },
     // 监听滚动
     handleScroll() {
-      // 获取所有 title-name-divider 元素
       const titleNameDividers = document.querySelectorAll('.title-name-divider');
       const elMain = document.querySelector('.el-main');
-      let _this = this
-      // 创建观察者实例
-      const observer = new IntersectionObserver((entries) => {
-        let entry = entries[0]
-        const rect = entry.target.getBoundingClientRect();
-        const distanceFromTop = rect.top;
-        if (distanceFromTop >= 0 && distanceFromTop <= 100 && _this.scrollObserverEnabled) {
-          const dataIndex = entry.target.getAttribute('data-index');
-          _this.affixIndex = dataIndex;  // 更新 affixIndex
-          console.log(dataIndex)
+
+      if (!elMain || titleNameDividers.length === 0) return;
+
+      let _this = this;
+
+      // 创建 IntersectionObserver 观察滚动元素
+      const observer = new IntersectionObserver(
+        (entries) => {
+          entries.forEach((entry) => {
+            if (entry.isIntersecting && _this.scrollObserverEnabled) {
+              const dataIndex = entry.target.getAttribute('data-index');
+              _this.affixIndex = dataIndex; // 更新 affixIndex
+            }
+          });
+        },
+        {
+          root: elMain, // 设置 el-main 为滚动容器
+          rootMargin: '30px 0px -70% 0px', // 确保元素在滚动到 30px 位置时触发
+          threshold: 0.1 // 交叉比例，确保元素部分可见时触发
         }
-      }, {
-        root: elMain, // 设置根元素为 el-main
-        rootMargin: '0px 0px 70% 0px'  // 可根据需要调整
-      });
+      );
 
-      // 开始观察每个 title-name-divider 元素
-      titleNameDividers.forEach(divider => {
-        observer.observe(divider);
-      });
+      // 观察每个 title-name-divider 元素
+      titleNameDividers.forEach((divider) => observer.observe(divider));
+
+      // 解绑旧的观察者（防止重复监听）
+      if (this.scrollObserver) {
+        this.scrollObserver.disconnect();
+      }
+      this.scrollObserver = observer;
     }
   }
 }

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

@@ -181,9 +181,16 @@ export default {
       if (item.children) {
         item = item.children[0]
       }
-      if (this.tagList.length == 1 && item.path == this.$route.fullPath) {
+      
+      // 兼容合并菜单
+      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)
@@ -193,7 +200,7 @@ export default {
         if (latestView) {
           this.$router.push(latestView)
         } else {
-          this.$router.push('/')
+          this.$router.push({ path: item.path })
         }
       }
     },

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

@@ -34,7 +34,7 @@
         <div class="aminui-body el-container">
           <div class="aminui-body-menu-top">
             <div class="top-bar-title">
-              <span class="title">{{ $t("layout.topbar") }}：</span>
+              <span class="title">{{ $t("lwLayout.layout.topbar") }}：</span>
               <Topbar v-if="!ismobile"></Topbar>
             </div>
             <userbar :isShowBu="isShowBu"
@@ -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: [],
@@ -199,7 +186,7 @@ export default {
     }
   },
   beforeCreate() {
-    // 挂载菜单订阅
+    // 挂载自定义菜单订阅
     this.$bus.$on('setMenu', (menu) => {
       this.changeMenu = true
       this.menu = this.filterUrl(menu)
@@ -214,12 +201,6 @@ export default {
     this.$store.state.global.menuIsCollapse = !!isMenuIsCollapse
   },
   async created() {
-    // 标识当前项目
-    let isCombined = this.$tool.data.get("MENUCOMBINED")
-    if (isCombined) {
-      this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME);
-    }
-
     this.onLayoutResize();
     window.addEventListener('resize', this.onLayoutResize);
     this.getUserInfo();
@@ -261,16 +242,15 @@ 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))
 
+      let userAuthInfo = {
+        ...user.userAuthInfo,
+        combined: user.combined,
+        loginPage: user.loginPage,
+        menuContent: user.menuContent,
+      }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
-      this.$tool.data.set('userAuthInfo', user.userAuthInfo)
-      this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
-      this.$store.state.user = user.userAuthInfo
-    },
-
-
-
-    openSetting() {
-      this.settingDialog = true;
+      this.$tool.data.set('userAuthInfo', userAuthInfo)
+      this.$store.state.user = userAuthInfo
     },
     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/lwLogin/index.vue

@@ -173,11 +173,6 @@ export default {
       type: Boolean,
       default: true
     },
-    // 是否手动合并菜单到同一个项目
-    isCombined: {
-      type: Boolean,
-      default: true
-    },
     // 是否加密登录
     isEncryption: {
       type: Boolean,
@@ -304,6 +299,7 @@ export default {
     this.$store.commit("clearViewTags");
     this.$store.commit("clearKeepLive");
     this.$store.commit("clearIframeList")
+    this.$tool.data.remove("MENU_LIST")
   },
   methods: {
     // 加密
@@ -324,7 +320,7 @@ export default {
         username: this.ruleForm.user,
         password: this.ruleForm.password,
       };
-      
+
       if (this.isEncryption) {
         const publicKey = await this.$api.auth.key()
         if (publicKey) {
@@ -356,14 +352,19 @@ export default {
       // 获取用户信息
       let user = await this.$api.auth.user()
       // 处理应用显示逻辑
-      let application  = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
+      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))
 
+      let userAuthInfo = {
+        ...user.userAuthInfo,
+        combined: user.combined,
+        loginPage: user.loginPage,
+        menuContent: user.menuContent,
+      }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
-      this.$tool.data.set('userAuthInfo', user.userAuthInfo)
+      this.$tool.data.set('userAuthInfo', userAuthInfo)
       // 用与应用菜单显示
-      this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
-      this.$store.state.user = user.userAuthInfo
+      this.$store.state.user = userAuthInfo
 
 
       // 兼容旧项目设置信息
@@ -372,42 +373,8 @@ export default {
       sessionStorage.setItem('easyweb_session_passport_bu_list', JSON.stringify({ v: bu }))
       document.cookie = `Authorization=Bearer ${token}`;
 
-      // 获取合并菜单信息  isCombined  这参数后期要加是否要合并菜单展示 现在默认tue
-      /**
-       * 此处进行 获取的数据路由router文件进行合并
-       * 需要开发一个接口返回  权限与具体页面路径映射数据 （这个功能要开发）
-       * 需要在  platform  菜单管理中  配置isCombined参数  用于标识是否合并项目菜单
-       * 原有的数据要加两个配置项 icon  path
-       * 返回的数据是
-       * [
-       *  {
-          "id": "ma_menu.workplace",
-          "tenantId": "connext",
-          "name": "工作台",
-          "type": "MENU",
-          ...
-          "applications": ["ma"],
-          "icon": 'el-icon-discount', // icon
-          "path": '/reach/flow-template/, // 菜单路径
-          "authority": [
-            "ma.marketing_center.locate",
-            "ma.marketing_center_operation.locate",
-          ]
-        }
-      * ]
-      */
-      if (user.combined || this.isCombined) {
-        let menu = await this.$api.auth.menu();
-        this.$tool.data.set("MENUCOMBINED", menu);
-        // 注入 用于判断子项目 是否扁平化
-        this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME);
-      } else {
-        this.$tool.data.remove("MENUCOMBINED");
-        this.$tool.data.remove("MENUCOMBINEDNMAE");
-      }
 
       // 检验是否初始化
-
       if (this.isInitialized) {
         let initialized = await this.$api.auth.initialized()
         this.$tool.data.set('zoneInitialized', initialized)

package/dist/components/lwSearch/cascader/cascader.vue

@@ -0,0 +1,44 @@
+<template>
+  <el-cascader v-model="value" :options="item.options" :props="item.props" :filterable="item.filterable" />
+</template>
+
+<script>
+export default {
+  emits: ["update:modelValue", "change"],
+  name: "Input",
+  props: {
+    disabled: { // 是否禁止操作
+      type: Boolean,
+      default: false
+    },
+    modelValue: { // 绑定的结果
+      type: [String, Number],
+      default: ""
+    },
+    item: { // 配置项
+      type: Object,
+      default: () => ({})
+    },
+  },
+  data() {
+    return {
+      value: this.modelValue
+    };
+  },
+  watch: {
+    modelValue(newVal) {
+      this.value = newVal;
+    },
+    value(newVal) {
+      const filter = this.item.filter ?? false;
+      if (filter) {
+        newVal = newVal.replace(/ /g, ',').replace(/\,/g, ',').replace(/\，/g, ',').replace(/\n/g, ',');
+      }
+      console.log('%c [ newVal ]-36', 'font-size:13px; background:pink; color:#bf2c9f;', newVal)
+
+      this.$emit('update:modelValue', newVal);
+      this.$emit('change', newVal);
+    }
+  }
+};
+</script>

package/dist/components/lwSearch/date/date.vue

@@ -1,19 +1,17 @@
 <template>
-  <div>
-    <el-date-picker :type="item.type || 'date'"
-                    :disabled="item.disabled"
-                    :format="item.format || 'YYYY-MM-DD'"
-                    :value-format="item.valueFormat"
-                    :placeholder="item.placeholder || $t('lwSearch.please_select')"
-                    :range-separator="item.rangeSeparator || $t('lwSearch.monthRange.rangeSeparator')"
-                    :start-placeholder="item.startPlaceholder || $t('lwSearch.monthRange.startPlaceholder')"
-                    :end-placeholder="item.endPlaceholder || $t('lwSearch.monthRange.endPlaceholder')"
-                    clearable
-                    v-model="value"
-                    :disabled-date="disabledDate"
-                    style="width: 100%">
-    </el-date-picker>
-  </div>
+  <el-date-picker :type="item.type || 'date'"
+                  :disabled="item.disabled"
+                  :format="item.format || 'YYYY-MM-DD'"
+                  :value-format="item.valueFormat"
+                  :placeholder="item.placeholder || $t('lwSearch.please_select')"
+                  :range-separator="item.rangeSeparator || $t('lwSearch.monthRange.rangeSeparator')"
+                  :start-placeholder="item.startPlaceholder || $t('lwSearch.monthRange.startPlaceholder')"
+                  :end-placeholder="item.endPlaceholder || $t('lwSearch.monthRange.endPlaceholder')"
+                  clearable
+                  v-model="value"
+                  :disabled-date="disabledDate"
+                  style="width: 100%">
+  </el-date-picker>
 </template>
 
 <script>

package/dist/components/lwSearch/dateRange/dateRange.vue

@@ -1,18 +1,16 @@
 <template>
-  <div>
-    <el-date-picker :showTime="item.showTime"
-                    :format="item.format || 'YYYY-MM-DD HH:mm:ss'"
-                    :value-format="item.valueFormat"
-                    clearable
-                    v-model="value"
-                    style="width: 100%"
-                    type="datetimerange"
-                    :start-placeholder="item.startPlaceholder || $t('lwSearch.dateRange.startPlaceholder')"
-                    :end-placeholder="item.endPlaceholder || $t('lwSearch.dateRange.endPlaceholder')"
-                    :default-time="item.defaultTime || defaultTime(0)"
-                    size="">
-    </el-date-picker>
-  </div>
+  <el-date-picker :showTime="item.showTime"
+                  :format="item.format || 'YYYY-MM-DD HH:mm:ss'"
+                  :value-format="item.valueFormat || 'YYYY-MM-DD HH:mm:ss'"
+                  clearable
+                  v-model="value"
+                  style="width: 100%"
+                  type="datetimerange"
+                  :start-placeholder="item.startPlaceholder || $t('lwSearch.dateRange.startPlaceholder')"
+                  :end-placeholder="item.endPlaceholder || $t('lwSearch.dateRange.endPlaceholder')"
+                  :default-time="item.defaultTime || defaultTime(0)"
+                  size="">
+  </el-date-picker>
 </template>
 
 <script>