Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/layout/component/columnsAside.vue

@@ -2,19 +2,11 @@
 	<div class="layout-columns-aside">
 		<el-scrollbar>
 			<ul @mouseleave="onColumnsAsideMenuMouseleave()">
-				<li
-					v-for="(v, k) in columnsAsideList"
-					:key="k"
-					@click="onColumnsAsideMenuClick(v, k)"
-					@mouseenter="onColumnsAsideMenuMouseenter(v, k)"
-					:ref="
-						(el) => {
-							if (el) columnsAsideOffsetTopRefs[k] = el;
-						}
-					"
-					:class="{ 'layout-columns-active': liIndex === k, 'layout-columns-hover': liHoverIndex === k }"
-					:title="v.meta?.title.indexOf('.')>0?$t(v.meta?.title):v.meta?.title"
-				>
+				<li v-for="(v, k) in columnsAsideList" :key="k" @click="onColumnsAsideMenuClick(v, k)" @mouseenter="onColumnsAsideMenuMouseenter(v, k)" :ref="
+					(el) => {
+						if (el) columnsAsideOffsetTopRefs[k] = el;
+					}
+				" :class="{ 'layout-columns-active': liIndex === k, 'layout-columns-hover': liHoverIndex === k }" :title="v.meta?.title.indexOf('.')>0?$t(v.meta?.title):v.meta?.title">
 					<div :class="setColumnsAsidelayout" v-if="!v.meta?.isLink || (v.meta?.isLink && v.meta.isIframe)">
 						<SvgIcon :name="v.meta?.icon" />
 						<div class="columns-vertical-title font12">

src/layout/navBars/breadcrumb/search.vue

@@ -94,7 +94,7 @@ export default defineComponent({
 		// 当前菜单选中时
 		const onHandleSelect = (item: any) => {
 			let { path, redirect } = item;
-			if (item.meta?.isLink && !item.meta.isIframe) window.open(item.meta?.isLink);
+			if (item.meta?.isLink && !item.meta.isIframe) window.open(item.meta?.linkUrl);
 			else if (redirect) router.push(redirect);
 			else router.push(path);
 			closeSearch();

src/layout/navMenu/subItem.vue

@@ -14,7 +14,7 @@
 					<span>{{ val.meta?.title.indexOf('.')>0?$t(val.meta?.title):val.meta?.title }}</span>
 				</template>
 				<template v-else>
-					<a :href="val.meta?.isLink" target="_blank" rel="opener" class="w100">
+					<a :href="val.meta?.linkUrl" target="_blank" rel="opener" class="w100">
 						<SvgIcon :name="val.meta?.icon" />
 						{{ val.meta?.title.indexOf('.')>0?$t(val.meta?.title):val.meta?.title }}
 					</a>

src/views/datahub/source/component/edit.vue

@@ -24,13 +24,14 @@
 				<el-divider content-position="left">规则表达式</el-divider>
 
 				<div v-for="(item, index) in rule" :key="index">
-					<el-form-item label="表达式">
-						<el-input v-model="item.expression" placeholder="请输入规则表达式" />
+					<el-form-item label="正则表达式">
+						<el-input v-model="item.expression" placeholder="请输入正则表达式" />
 					</el-form-item>
 
-					<el-form-item label="参数">
-						<el-input v-model="item.params.name" placeholder="请输入键值" class="w-35" />
-						<el-input v-model="item.params.value" placeholder="请输入值" class="w-35" />
+					<el-form-item label="替换内容">
+						<el-input v-model="item.replace" placeholder="请输入替换内容" class="w-35" />
+						<!-- <el-input v-model="item.params.name" placeholder="请输入键值" class="w-35" />
+						<el-input v-model="item.params.value" placeholder="请输入值" class="w-35" /> -->
 						<div class="conicon">
 							<el-icon @click="delRule(index)" v-if="index > 0"><Delete /></el-icon>
 						</div>
@@ -140,16 +141,18 @@ export default defineComponent({
 			ruledata: [
 				{
 					expression: '',
-					params: {},
+					replace: '',
+					//params: {},
 				},
 			],
 			rule: [
 				{
 					expression: '',
-					params: {
-						name: '',
-						value: '',
-					},
+					replace: '',
+					// params: {
+					// 	name: '',
+					// 	value: '',
+					// },
 				},
 			],
 			requestParams: [
@@ -250,10 +253,11 @@ export default defineComponent({
 		const addRule = () => {
 			state.rule.push({
 				expression: '',
-				params: {
-					name: '',
-					value: '',
-				},
+				replace: '',
+				// params: {
+				// 	name: '',
+				// 	value: '',
+				// },
 			});
 		};
 		// 打开弹窗
@@ -269,8 +273,9 @@ export default defineComponent({
 
 					res.data.sourceRule.forEach((item, index) => {
 						state.rule[index].expression = item.expression;
-						state.rule[index].params.name = Object.keys(item.params);
-						state.rule[index].params.value = item.params[Object.keys(item.params)];
+						state.rule[index].replace = item.replace;
+						// state.rule[index].params.name = Object.keys(item.params);
+						// state.rule[index].params.value = item.params[Object.keys(item.params)];
 					});
 				});
 			}
@@ -316,11 +321,11 @@ export default defineComponent({
 			formWrap.validate((valid: boolean) => {
 				if (valid) {
 					//修改rule数据
-					state.rule.forEach((item, index) => {
-						item.params[item.params.name] = item.params.value;
-						delete item.params.name;
-						delete item.params.value;
-					});
+					// state.rule.forEach((item, index) => {
+					// 	item.params[item.params.name] = item.params.value;
+					// 	delete item.params.name;
+					// 	delete item.params.value;
+					// });
 
 					state.ruleForm.rule = state.rule;
 					state.config.requestParams = state.requestParams;

src/views/datahub/source/component/editNode.vue

@@ -29,13 +29,14 @@
 				<el-divider content-position="left">规则表达式</el-divider>
 
 				<div v-for="(item, index) in rule" :key="index">
-					<el-form-item label="表达式">
+					<el-form-item label="正则表达式">
 						<el-input v-model="item.expression" placeholder="请输入规则表达式" />
 					</el-form-item>
 
-					<el-form-item label="参数">
-						<el-input v-model="rule[index].params.name" placeholder="请输入键值" class="w-35" />
-						<el-input v-model="rule[index].params.value" placeholder="请输入值" class="w-35" />
+					<el-form-item label="替换内容">
+						<el-input v-model="item.replace" placeholder="请输入替换内容" class="w-35" />
+						<!-- <el-input v-model="rule[index].params.name" placeholder="请输入键值" class="w-35" />
+						<el-input v-model="rule[index].params.value" placeholder="请输入值" class="w-35" /> -->
 						<div class="conicon">
 							<el-icon @click="delRule(index)" v-if="index > 0"><Delete /></el-icon>
 						</div>
@@ -133,19 +134,21 @@ export default defineComponent({
 			ruledata: [
 				{
 					expression: '',
-					params: {
-						name: '',
-						value: '',
-					},
+					replace: '',
+					// params: {
+					// 	name: '',
+					// 	value: '',
+					// },
 				},
 			],
 			rule: [
 				{
 					expression: '',
-					params: {
-						name: '',
-						value: '',
-					},
+					replace: '',
+					// params: {
+					// 	name: '',
+					// 	value: '',
+					// },
 				},
 			],
 
@@ -176,10 +179,11 @@ export default defineComponent({
 		const addRule = () => {
 			state.rule.push({
 				expression: '',
-				params: {
-					name: '',
-					value: '',
-				},
+				replace: '',
+				// params: {
+				// 	name: '',
+				// 	value: '',
+				// },
 			});
 		};
 		// 打开弹窗
@@ -194,8 +198,9 @@ export default defineComponent({
 
 				data.forEach((item, index) => {
 					state.rule[index].expression = item.expression;
-					state.rule[index].params.name = Object.keys(item.params);
-					state.rule[index].params.value = item.params[Object.keys(item.params)];
+					state.rule[index].replace = item.replace;
+					// state.rule[index].params.name = Object.keys(item.params);
+					// state.rule[index].params.value = item.params[Object.keys(item.params)];
 				});
 			}
 
@@ -229,11 +234,11 @@ export default defineComponent({
 			formWrap.validate((valid: boolean) => {
 				if (valid) {
 					//修改rule数据
-					state.rule.forEach((item, index) => {
-						item.params[item.params.name] = item.params.value;
-						delete item.params.name;
-						delete item.params.value;
-					});
+					// state.rule.forEach((item, index) => {
+					// 	item.params[item.params.name] = item.params.value;
+					// 	delete item.params.name;
+					// 	delete item.params.value;
+					// });
 
 					state.ruleForm.rule = state.rule;