Merge branch 'cli' into 'master'

Cli

See merge request !3

src/api/sys/Dict.ts

@@ -31,9 +31,9 @@ export function deleteDict(id) {
     method: 'DELETE',
   });
 }
-export function viewDict(id) {
+export function viewDict(id, groupId) {
   return request({
-    url: Api.viewDictUrl + id,
+    url: Api.viewDictUrl + id + '/' + groupId,
     method: 'GET',
   });
 }

src/views/job/Schedulog/Schedulog.data.ts

@@ -10,7 +10,9 @@ export function listColumns(showDetail: Function): TableColumnSchema[]{
       title: '任务名称',
       field: 'name',
       query: true,
-      width: 100,
+      minWidth: 120,
+      resizable: true,
+      showOverflow: "ellipsis",
       renderCustom: ({ row }) => {
         return createOpenTitle(showDetail,row,'name');
       }
@@ -52,13 +54,8 @@ export function listColumns(showDetail: Function): TableColumnSchema[]{
     {
       title: '执行结果',
       field: 'result',
-      width: 120,
-      showOverflow: "ellipsis"
-    },
-    {
-      title: '错误日志',
-      field: 'errMsg',
-      width: 120,
+      minWidth: 120,
+      resizable: true,
       showOverflow: "ellipsis"
     },
     {
@@ -70,8 +67,7 @@ export function listColumns(showDetail: Function): TableColumnSchema[]{
         queryType: 'BETWEEN',
         componentProps:{
           type: 'daterange'
-        },
-        queryType: 'BETWEEN'
+        }
       },
       width: 170,
     },
@@ -80,6 +76,12 @@ export function listColumns(showDetail: Function): TableColumnSchema[]{
       field: 'endTime',
       sortable: true,
       width: 170,
+    },
+    {
+      title: '错误日志',
+      field: 'errMsg',
+      minWidth: 120,
+      showOverflow: "ellipsis"
     }
   ];
 }

src/views/sys/Dict/DictDetail.vue

@@ -32,7 +32,7 @@
         let isIdDisabled = true;
         try {
           if (data && data.id) {
-            const billData = (await viewDict(data.id)).data;
+            const billData = (await viewDict(data.id, data.groupId)).data;
             billData.code = billData.id;
             await setProps({ conentLoading: false });
             setFieldsValue(billData, true);

src/views/sys/Dict/index.vue

@@ -95,7 +95,7 @@ export default defineComponent({
       })
 		};
 		function handleChangeStatus(record: any) {
-			changeEnable({ id: record.id, isEnable: record.isEnable === 1 ? 0 : 1 }).then((res: Result<any>) => {
+			changeEnable({ id: `${record.id}|${record.groupId}`, isEnable: record.isEnable === 1 ? 0 : 1 }).then((res: Result<any>) => {
 				handleSuccess();
 				ElMessage.success(res.msg);
 			});