Merge remote-tracking branch 'origin/master'

web/src/views/system/columns/components/ColumnsTableCom/index.vue

@@ -58,7 +58,7 @@ import { ElMessageBox } from 'element-plus';
 import ColumnsFormCom from '../ColumnsFormCom/index.vue';
 import { getColumnsData, automatchColumnsData, deleteColumnsData, updateColumnsData } from './api';
 import { successNotification, warningNotification } from '/@/utils/message';
-import { CurrentInfoType, ColumnsFormDataType, AddColumnsDataType } from '../../types';
+import { APIResponseData, CurrentInfoType, ColumnsFormDataType, AddColumnsDataType } from '../../types';
 
 const props = defineProps({
 	currentInfo: {
@@ -149,7 +149,9 @@ const handleDelete = ({ id }: { id: number }) => {
 };
 
 const handleChange = (record: AddColumnsDataType) => {
-	updateColumnsData(record);
+	updateColumnsData(record).then((res: APIResponseData) => {
+		successNotification(res.msg || '更新成功');
+	});
 };
 
 /**

web/src/views/system/columns/components/ItemCom/index.vue

@@ -113,6 +113,8 @@ onMounted(() => {
 		white-space: nowrap;
 		overflow: auto;
 		.item-com-item {
+			width: fit-content;
+			min-width: 100%;
 			padding: 10px 16px;
 			border-radius: 8px;
 			cursor: pointer;

web/src/views/system/columns/types.ts

@@ -3,6 +3,12 @@ export interface PageQuery {
   limit: number;
 }
 
+export interface APIResponseData {
+  code?: number;
+  data: any;
+  msg?: string;
+}
+
 export interface CurrentInfoType {
   role: string;
   model: string;