解决冲突
This commit is contained in:
		@ -52,8 +52,8 @@ export class ParterLevelConfigListComponent implements OnInit {
 | 
			
		||||
          title: '状态',
 | 
			
		||||
          enum: [
 | 
			
		||||
            { label: '全部', value: '' },
 | 
			
		||||
            { label: '启用', value: '1' },
 | 
			
		||||
            { label: '禁用', value: '0' }
 | 
			
		||||
            { label: '启用', value: '0' },
 | 
			
		||||
            { label: '禁用', value: '1' }
 | 
			
		||||
          ],
 | 
			
		||||
          ui: {
 | 
			
		||||
            widget: 'select'
 | 
			
		||||
@ -96,7 +96,7 @@ export class ParterLevelConfigListComponent implements OnInit {
 | 
			
		||||
        title: '状态',
 | 
			
		||||
        index: 'stateLocked',
 | 
			
		||||
        format: (item: any) => {
 | 
			
		||||
          return item.stateLocked ? '启用' : '禁用';
 | 
			
		||||
          return item.stateLocked ? '禁用' : '启用';
 | 
			
		||||
        }
 | 
			
		||||
      },
 | 
			
		||||
      {
 | 
			
		||||
@ -110,12 +110,12 @@ export class ParterLevelConfigListComponent implements OnInit {
 | 
			
		||||
          {
 | 
			
		||||
            text: '禁用',
 | 
			
		||||
            click: (_record, _modal, _instance) => this.stop(_record),
 | 
			
		||||
            iif: item => item.stateLocked
 | 
			
		||||
            iif: item => !item.stateLocked
 | 
			
		||||
          },
 | 
			
		||||
          {
 | 
			
		||||
            text: '启用',
 | 
			
		||||
            click: (_record, _modal, _instance) => this.restart(_record),
 | 
			
		||||
            iif: item => !item.stateLocked
 | 
			
		||||
            iif: item => item.stateLocked
 | 
			
		||||
          }
 | 
			
		||||
        ]
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user