refactor: 微调公共模板逻辑，让页面的配置可单独覆盖公共模板配置

mineadmin · Oct 31, 2023 · b402d52 · b402d52
1 parent 81c96a5
commit b402d52
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/components/ma-crud/index.vue b/src/components/ma-crud/index.vue
@@ -367,7 +367,7 @@ const dictColors = (dataIndex, value) => {
  // 公用模板
 columns.value.map((item, index) => {
   if (item.common && globalColumn[item.dataIndex]) {
-    columns.value[index] = globalColumn[item.dataIndex]
+    columns.value[index] = Object.assign(globalColumn[item.dataIndex], item)
     item = columns.value[index]
   }
   !item.width && (item.width = options.value.columnWidth)