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

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

@@ -30,10 +30,10 @@
 				</div>
 
 				<el-form-item label="字段节点标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入字段节点名称" />
+					<el-input v-model="ruleForm.key" placeholder="请输入字段节点名称"  :disabled="ruleForm.from==2"/>
 				</el-form-item>
 				<el-form-item label="字段节点名称" prop="name">
-					<el-input v-model="ruleForm.name" placeholder="请输入字段节点名称" />
+					<el-input v-model="ruleForm.name" placeholder="请输入字段节点名称" :disabled="ruleForm.from==2"/>
 				</el-form-item>
 
 
@@ -53,7 +53,7 @@
 				</el-form-item>
 
 
-				<el-form-item label="默认值" prop="default">
+				<el-form-item label="默认值" prop="default" v-if="ruleForm.from==1">
 					<el-input v-model="ruleForm.default" placeholder="请输入取值项" />
 				</el-form-item>
 

src/views/datahub/modeling/detail.vue

@@ -76,8 +76,8 @@
 
 					<el-table-column label="操作" width="200" align="center" fixed="right">
 						<template #default="scope">
-							<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)">修改</el-button>
-							<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+							<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="developer_status==0">修改</el-button>
+							<el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="developer_status==0">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>

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

@@ -71,7 +71,7 @@
 								<el-input v-model="item.key" placeholder="请输入参数名" style="width: 320px" />
 								<el-input v-model="item.value" placeholder="请输入参数值" style="width: 320px" />
 								<div class="conicon">
-									<el-icon @click="delParams(index)" v-if="index > 0"><Delete /></el-icon>
+									<el-icon @click="delParams(index)" ><Delete /></el-icon>
 								</div>
 							</div>
 							<el-button type="primary" class="addbutton" @click="addParams">增加</el-button>
@@ -216,12 +216,7 @@ export default defineComponent({
 				},
 			],
 			requestParams: [
-				{
-					type: '',
-					key: '',
-					name: '',
-					value: '',
-				},
+				
 			],
 			methodData: [
 				{

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

@@ -68,7 +68,7 @@
 				title="点击蓝色key值进行选择"
 				width="30%"
 			>
-					<JsonViewer :value="jsonData"  boxed sort theme="jv-dark" @click="onKeyclick" />
+					<JsonViewer :value="jsonData" :show-double-quotes="true"	  boxed sort theme="jv-dark" @click="onKeyclick" />
 
 				<template #footer>
 				<span class="dialog-footer">
@@ -310,17 +310,47 @@ export default defineComponent({
 		};
 
 		const onKeyclick=(e)=>{
+			//console.log(e);
 			if(e.target.innerText && e.target.className=='jv-key'){
 				let str = e.target.innerText;  
 				str = str.substr(0, str.length - 1);
 				state.ruleForm.value=str;
 				state.dialogVisible = false;
+				//console.log(getOrgIdArr(state.jsonData,str));
 			}
 			
 		};
 
+		const getOrgIdArr=(obj, child, parent)=>{
+			
+			for (var key in obj) { 
+				console.log(key);
+				if (child === key) {
+					return parent; 
+				} else { 
+					return getOrgIdArr(obj[key], child, obj);
+				}
+			} 
+
+		};
+
+		const findKey=(obj, key)=>{
+			var queue = Object.keys(obj).map(k => ({item: obj[k], parent: obj, key: k}))
+                while(queue.length > 0) {
+                    var top = queue.shift()
+                    if (top.key === key) {
+                        return top.parent
+                    }
+                    if (typeof top.item === 'object') {
+                        queue.push(...Object.keys(top.item).map(k => ({item: top.item[k], parent: top.item, key: k})))
+                    }
+                }
+		}
+
 		return {
+			findKey,
 			onKeyclick,
+			getOrgIdArr,
 			addRule,
 			onTest,
 			delRule,

src/views/datahub/source/detail.vue

@@ -79,7 +79,7 @@
 							<div class="title">数据节点</div>
 							<div><el-button type="primary" @click="onOpenEdit()">添加</el-button></div>
 						</div>
-
+				
 						<el-table :data="tableData.data" style="width: 100%">
 							<el-table-column label="ID" align="center" prop="nodeId" width="80" />
 							<el-table-column label="数据标识" prop="key" :show-overflow-tooltip="true" />
@@ -91,8 +91,8 @@
 
 							<el-table-column label="操作" width="200" align="center" fixed="right">
 								<template #default="scope">
-									<el-button size="small" text type="warning" @click="onOpenEdit1(scope.row)">修改</el-button>
-									<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+									<el-button size="small" text type="warning" @click="onOpenEdit1(scope.row)" v-if="developer_status==0">修改</el-button>
+									<el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="developer_status==0" >删除</el-button>
 								</template>
 							</el-table-column>
 						</el-table>
@@ -100,7 +100,6 @@
 							v-show="tableData.total > 0"
 							:total="tableData.total"
 							v-model:page="tableData.param.pageNum"
-							v-model:limit="tableData.param.pageSize"
 							@pagination="typeList"
 						/>
 					</div>