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

package.json

@@ -7,11 +7,11 @@
   "scripts": {
     "dev": "npm run plugin:check && npm run writeEnv:dev && vite --force",
     "plugin:check": "ls ./public/plugin/topo && npm run plugin:has || npm run plugin:not",
-    "plugin:has": "echo '\\033[31m 插件存在，无需拉取 \\033[0m'",
+    "plugin:has": "echo '\\033[31m 插件更新中，更新后自动运行 \\033[0m' && npm run plugin:pull",
     "plugin:not": "echo '\\033[31m 插件不存在，需要拉取 拉取后会自动运行 \\033[0m' && npm run plugin:clone",
     "plugin:clone": "git clone --depth 1 http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui-plugin.git ./public/plugin/",
-    "plugin:pull": "cd ./public/plugin/ && git pull || npm run plugin:clone",
-    "plugin:update": "rm -rf ./public/plugin/ && npm run plugin:pull",
+    "plugin:pull": "cd ./public/plugin/ && git pull || npm run plugin:clone && echo '\\033[31m 插件更新完毕 \\033[0m'",
+    "plugin:reload": "rm -rf ./public/plugin/ && npm run plugin:pull",
     "build": "npm run plugin:check && cross-env NODE_ENV=production node ./writeEnv.mjs && vite build && npm run getVersion",
     "build:dev": "npm run plugin:check && npm run writeEnv:dev && vite build --mode development && npm run getVersion",
     "build:golocal": "npm run plugin:check && cross-env NODE_ENV=golocal node ./writeEnv.mjs && vite build --mode golocal && npm run getVersion",

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

@@ -345,7 +345,6 @@ const ruleForm = {
 		{ required: true, message: '请求方法不能为空', trigger: 'change' },
 		{
 			validator: (rule: any, value: string, callback: any) => {
-				console.log(formData.config.method);
 				if (formData.from === 1 && !formData.config.method) {
 					callback(new Error('请求方法不能为空'));
 				} else {
@@ -391,7 +390,7 @@ const onSubmit = async () => {
 			from: formData.from,
 			config: {
 				...formData.config,
-				 requestParams: requestParams.value
+				requestParams: requestParams.value
 			},
 		};
 		const theApi = sourceId.value ? api.common.edit : api.common.add
@@ -432,11 +431,6 @@ const onSubmit = async () => {
 		showDialog.value = false
 		emit('typeList')
 	}
-
-
-
-
-
 }
 
 const resetForm = async () => {

src/views/system/datahub/source/index.vue

@@ -21,12 +21,6 @@
 						</el-icon>
 						查询
 					</el-button>
-					<!-- <el-button v-auth="'reset'" @click="resetQuery()">
-						<el-icon>
-							<ele-Refresh />
-						</el-icon>
-						重置
-					</el-button> -->
 					<el-button v-auth="'add'" type="primary" class="ml10" @click="onOpenAdd">
 						<el-icon>
 							<ele-FolderAdd />
@@ -129,12 +123,6 @@ const onOpenAdd = () => {
 const onOpenEdit = async (row?: any) => {
 	editDicRef.value.openDialog(row)
 }
-// 重置表单
-const resetQuery = () => {
-	queryRef.value.resetFields()
-	getList()
-}
-
 //复制数据
 const copy = (row: any) => {
 	ElMessageBox.confirm('确定要复制该数据吗？', '提示', {

writeEnv.mjs

@@ -24,6 +24,7 @@ const configJson = {
 		iotServer: baseUrl,
 	},
 	designer: {
+		baseServer: VITE_SERVER_ORIGIN + VITE_NGINX_PROXY,
 		server: baseUrl,
 	},
 	media: VITE_MEDIA_SERVER_URL,