Merge pull request 'dev-xjf' (#103) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-front/pulls/103

src/views/run/instant/instant.data.ts

@@ -111,7 +111,6 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: ({ schema, tableAction, formActionType, formModel }) => {
       return {
       // xxxx props
-        allowClear: false,
         placeholder: '全部机组',
         options: optionList.units.map(unit => ({ value: unit.id, label: unit.name })),
         onChange: async (e: any) => {
@@ -124,7 +123,7 @@ export const searchFormSchema: FormSchema[] = [
             typeId: formModel.type,
           }
           //如果typeId是空，则不设置system'Options
-          if (!param.typeId) {
+          if (!param.typeId || !param.unitId) {
             systemOptions.value = []
             return
           }
@@ -144,7 +143,6 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
-        allowClear: false,
         placeholder: '全部系统',
         options: optionList.types.map(type => ({ value: type.id, label: type.name })),
         onChange: async (e: any) => {
@@ -157,7 +155,7 @@ export const searchFormSchema: FormSchema[] = [
             typeId: e,
           }
           //如果typeId是空，则不设置system'Options
-          if (!param.typeId) {
+          if (!param.typeId || !param.unitId) {
             systemOptions.value = []
             return
           }
@@ -175,7 +173,6 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: () => {
       return {
-        allowClear: false,
         placeholder: '全部子系统',
         options: systemOptions.value.map(system => ({ value: system.id, label: system.name })),
       }