dev-xjf #103

Merged
xiaojinfei merged 2 commits from dev-xjf into master 3 weeks ago
  1. 7
      src/views/run/instant/instant.data.ts

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

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

Loading…
Cancel
Save