Merge remote-tracking branch 'origin/master'

src/views/flow/form/data.tsx

@@ -57,15 +57,27 @@ export const templateForms = [
 		options: typeOptions
 	},
 	{
-		prop: 'pcUrl',
-		label: 'PC端地址',
-		itemType: 'input',
-		rules: [{ required: true, message: '请输入PC端地址', trigger: 'blur' }]
-	},
-	{
-		prop: 'appUrl',
-		label: 'APP端地址',
-		itemType: 'input'
+		prop: '_box',
+		props: ['pcUrl', 'appUrl'],
+		itemType: 'render',
+		labelWidth: '0px',
+		style: 'margin-bottom: 0',
+		render: (extendsParams: any) => {
+			const { form, params } = extendsParams
+			// 系统表单
+			if (params.type === 1) {
+				const rules_1 = [{ required: true, message: '请输入PC端地址', trigger: 'blur' }]
+				return [
+					<el-form-item prop="pcUrl" label="PC端地址" rules={rules_1} style="width:100%">
+						<el-input v-model={params.pcUrl} />
+					</el-form-item>,
+					<el-form-item prop="appUrl" label="APP端地址" style="width:100%;">
+						<el-input v-model={params.appUrl} />
+					</el-form-item>
+				]
+			}
+			return ''
+		}
 	},
 	{
 		prop: 'status',