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

src/components/devantd/index.vue

@@ -19,7 +19,7 @@ const props = defineProps({
 
 onMounted(() => {
 	const tinyArea = new TinyArea(props.antdid, {
-		height: 60,
+		height: 40,
 		autoFit: true,
 		data: props.json,
 		smooth: true,

src/views/iot/device/instance/detail.vue

@@ -842,6 +842,7 @@ tr {
 .statusname {
 	font-size: 30px;
 	margin-top: 10px;
+  margin-bottom: 15px;
 }
 .comtest {
 	margin-top: 20px;

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

@@ -168,9 +168,9 @@
 							<el-input v-model="tabconfig.dbName" placeholder="请输入数据库名称" />
 						</el-form-item>
 
-						<el-form-item label="执行方式" prop="type">
-							<el-radio-group v-model="tabconfig.tabtype" >
-								<el-radio label="tab">数据表</el-radio>
+						<el-form-item label="执行方式" prop="queryType">
+							<el-radio-group v-model="tabconfig.queryType" >
+								<el-radio label="tableName">数据表</el-radio>
 								<el-radio label="sql">Sql</el-radio>
 							
 							</el-radio-group>
@@ -178,14 +178,15 @@
 						
 						<el-form-item label="">
 							<el-input
-								v-model="textarea2"
+								v-model="tabconfig.tableName"
 								type="textarea"
+								:placeholder="tabconfig.queryType=='sql'?'请输入sql语句':'请输入表名称'"
 							/>
 						</el-form-item>
 
-						<el-form-item label="表名称">
+						<!-- <el-form-item label="表名称">
 							<el-input v-model="tabconfig.tableName" placeholder="请输入表名称" />
-						</el-form-item>
+						</el-form-item> -->
 
 						<el-form-item label="主键字段">
 							<el-input v-model="tabconfig.pk" placeholder="请输入主键字段" />