lw-cdp-ui 1.1.24 → 1.1.26

package/dist/components/lwFlow/config/nodesList.js

@@ -65,7 +65,8 @@ export default [
 				name: '接收事件',
 				icon: 'icon-event',
 				type: 'event_receive',
-				themeColor: '#39BCC5'
+				themeColor: '#39bcc5',
+				background: '#f2fcfa'
 			},
 			{
 				name: '人群包',
@@ -81,7 +82,7 @@ export default [
 			{
 				name: '短信',
 				icon: 'icon-auto-reply',
-				type: 'event_receive',
+				type: 'sms',
 				themeColor: '#4594f3'
 			},
 			{

package/dist/components/lwFlow/index.vue

@@ -365,8 +365,11 @@ export default {
             case 'reduce':
               await et2lTable(this.logicFlow, node);
               break;
+            case 'event_receive':
+              await nodeCustom(this.logicFlow, node, this.$store.state);
+              break;
             default:
-              await nodeCustom(this.logicFlow, node);
+              await nodeCustom(this.logicFlow, node, this.$store.state);
               break;
           }
         }

package/dist/components/lwFlow/nodeEdit/basicSettings.vue

@@ -112,6 +112,27 @@ export default {
       if (nodeConfig?.labelPosition) {
         config.labelPosition = nodeConfig.labelPosition
       }
+
+      // 处理需要接口的内容
+      if (!this.$store.state[`lwFlow_${this.type}`]) {
+        this.$store.state[`lwFlow_${this.type}`] = {}
+      }
+      nodeConfig.formItems.forEach(async item => {
+        if (item?.options?.items) {
+          if (item.api) {
+            let items = await item.api(this.$http)
+            item.options.items = items || []
+          }
+
+          // 全局化选项内容 用于回显数据
+          if (item?.options?.name) {
+            this.$store.state[`lwFlow_${this.type}`][`${item.name}.${item.options.name}`] = item?.options?.items || ''
+          } else {
+            this.$store.state[`lwFlow_${this.type}`][item.name] = item?.options?.items || ''
+          }
+        }
+      })
+
       if (nodeConfig?.formItems) {
         config.formItems = nodeConfig.formItems
       }

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

@@ -3,7 +3,7 @@
  */
 import dayjs from 'dayjs'
 import nodeDatas from '../nodesData/index.js'
-export default function registerCustom(lf, node) {
+export default function registerCustom(lf, node, state) {
 	// 是否显示
 	function hideHandle(item, data) {
 		if (Object.keys(data).length == 0) return false
@@ -35,9 +35,11 @@ export default function registerCustom(lf, node) {
 					value = dayjs(value).format(item['value-format'] || 'YYYY-MM-DD HH:mm:ss')
 				}
 			}
+
 			// 转换
-			if (item?.items) {
-				let x = item.items.find((x) => {
+			if (state[`lwFlow_${node.type}`] && state[`lwFlow_${node.type}`][item.value]) {
+				let items = state[`lwFlow_${node.type}`][item.value]
+				let x = items.find((x) => {
 					return x.value == value
 				})
 				value = x?.label
@@ -65,7 +67,7 @@ export default function registerCustom(lf, node) {
 				el.style.borderColor = properties?.style?.borderColor || node.themeColor || ''
 				el.style.borderWidth = `${properties?.style?.borderWidth || 2}px`
 				el.style.color = properties?.style?.fontColor || '' // 使用 color 替代 font-color
-				el.style.fontSize = `${properties?.style?.fontSize || 14}px` // 默认字体大小为 12px
+				el.style.fontSize = `${properties?.style?.fontSize || 12}px` // 默认字体大小为 12px
 				el.style.fontFamily = properties?.style?.fontFamily || 'Microsoft YaHei' // 添加默认字体
 				el.style.lineHeight = properties?.style?.lineHeight || '1'
 				el.style.fontWeight = properties?.style?.fontWeight || ''

package/dist/components/lwFlow/nodesData/datas/eventReceive.js

@@ -0,0 +1,60 @@
+/**
+ * 营销目标: 接收事件
+ */
+
+export default {
+	// 暂无显示需求
+	nodeHtml: [
+		{
+			label: '事件',
+			component: 'select',
+			value: 'behaviorId'
+		}
+	],
+	// 目标节点校验
+	targetRules: [],
+	// 表单内容
+	formConfig: {
+		labelWidth: '70px',
+		labelPosition: 'top',
+		formItems: [
+			{
+				label: '选择事件',
+				name: 'behaviorId',
+				value: '',
+				component: 'select',
+				span: 24,
+				options: {
+					items: [],
+					placeholder: '请选择'
+				},
+				async api(http, value) {
+					const params = { fields: 'name,modelId,status' }
+					params.expression = `status in ENABLED`
+					if (value) {
+						params.expression = `name like ${value} AND ${params.expression}`
+					}
+					let list = await http.get(`/api/ma-manage/{tenantId}/{buCode}/behavior-event/list`, params)
+
+					list = list.map((item) => ({
+						value: item.id,
+						label: `[${item.name}] ${item.id}`
+					}))
+					return list
+				},
+				rules: [{ required: true, message: '不能为空', trigger: 'change' }]
+			},
+			{
+				label: '描述信息',
+				name: 'desp',
+				value: '',
+				component: 'input',
+				options: {
+					type: 'textarea',
+					placeholder: '请输入'
+				},
+				span: 24
+			}
+		]
+	}
+}

package/dist/components/lwFlow/nodesData/datas/timer.js

@@ -8,21 +8,7 @@ export default {
 		{
 			label: '定时器类型',
 			component: 'radio',
-			value: 'schedule.type',
-			items: [
-				{
-					label: '单次',
-					value: 'DATE'
-				},
-				{
-					label: '多次',
-					value: 'CRON'
-				},
-				{
-					label: '延时',
-					value: 'DELAY'
-				}
-			]
+			value: 'schedule.type'
 		},
 		{
 			label: '日期时间',

package/dist/components/lwFlow/nodesData/index.js

@@ -19,15 +19,17 @@ import reduce from './datas/reduce'
 import source from './datas/source'
 import target from './datas/target'
 import timer from './datas/timer'
+import event_receive from './datas/eventReceive'
 
 export default {
-  collap,
-  expand,
-  filter,
-  joiner,
-  mapper,
-  reduce,
-  source,
-  target,
-  timer,
+	collap,
+	expand,
+	filter,
+	joiner,
+	mapper,
+	reduce,
+	source,
+	target,
+	timer,
+	event_receive
 }

package/dist/components/lwLayout/components/bu.vue

@@ -59,7 +59,7 @@ export default {
     let buCode = this.$tool.data.get('buCode')
     if (!this.buList.length) {
       let buResult = await this.$api.auth.bu()
-      let bu = buResult.data || []
+      let bu = buResult || []
       this.$tool.data.set('buList', bu)
       this.buList = bu
       this.$tool.data.set('buCode', bu[0].code)

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

@@ -1,5 +1,6 @@
 <template>
   <div class="user-bar">
+    <slot name="userbarActionBox"></slot>
     <bu v-if="isShowBu"
         :isInitialized="isInitialized" />
 

package/dist/components/lwLayout/index.vue

@@ -23,7 +23,11 @@
       </div>
       <div class="adminui-header-right">
         <userbar :isShowBu="isShowBu"
-                 :isInitialized="isInitialized"></userbar>
+                 :isInitialized="isInitialized">
+          <template #userbarActionBox>
+            <slot name="userbarActionBox"></slot>
+          </template>
+        </userbar>
       </div>
     </header>
     <section class="aminui-wrapper">
@@ -45,7 +49,8 @@
         </div>
         <div class="adminui-side-bottom"
              @click="$store.commit('TOGGLE_menuIsCollapse')">
-          <el-icon><el-icon-expand v-if="menuIsCollapse" /><el-icon-fold v-else /></el-icon>
+          <el-icon><el-icon-expand v-if="menuIsCollapse" /><el-icon-fold
+                          v-else /></el-icon>
         </div>
       </div>
       <Side-m v-if="ismobile"></Side-m>
@@ -94,7 +99,8 @@
           </div>
           <div class="adminui-side-bottom"
                @click="$store.commit('TOGGLE_menuIsCollapse')">
-            <el-icon><el-icon-expand v-if="menuIsCollapse" /><el-icon-fold v-else /></el-icon>
+            <el-icon><el-icon-expand v-if="menuIsCollapse" /><el-icon-fold
+                            v-else /></el-icon>
           </div>
         </div>
         <Side-m v-if="ismobile"></Side-m>
@@ -105,14 +111,19 @@
               <Topbar v-if="!ismobile"></Topbar>
             </div>
             <userbar :isShowBu="isShowBu"
-                     :isInitialized="isInitialized"></userbar>
+                     :isInitialized="isInitialized">
+              <template #userbarActionBox>
+                <slot name="userbarActionBox"></slot>
+              </template>
+            </userbar>
           </div>
           <Tags v-if="!ismobile && layoutTags"></Tags>
           <div class="adminui-main"
                id="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" />
@@ -150,7 +161,11 @@
         </div>
         <Side-m v-if="ismobile"></Side-m>
         <userbar :isShowBu="isShowBu"
-                 :isInitialized="isInitialized"></userbar>
+                 :isInitialized="isInitialized">
+          <template #userbarActionBox>
+            <slot name="userbarActionBox"></slot>
+          </template>
+        </userbar>
       </div>
     </header>
     <section class="aminui-wrapper">
@@ -216,14 +231,19 @@
         </div>
         <div class="adminui-side-bottom"
              @click="$store.commit('TOGGLE_menuIsCollapse')">
-          <el-icon><el-icon-expand v-if="menuIsCollapse" /><el-icon-fold v-else /></el-icon>
+          <el-icon><el-icon-expand v-if="menuIsCollapse" /><el-icon-fold
+                          v-else /></el-icon>
         </div>
       </div>
       <Side-m v-if="ismobile"></Side-m>
       <div class="aminui-body el-container">
         <Topbar>
           <userbar :isShowBu="isShowBu"
-                   :isInitialized="isInitialized"></userbar>
+                   :isInitialized="isInitialized">
+            <template #userbarActionBox>
+              <slot name="userbarActionBox"></slot>
+            </template>
+          </userbar>
         </Topbar>
         <Tags v-if="!ismobile && layoutTags"></Tags>
         <div class="adminui-main"