From 16603f534c39e167269ae371d037ea873008d8f4 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 10 Apr 2024 17:21:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8F=82=E6=95=B0=20quickEdit=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=98=BE=E9=9A=90=E6=90=9C=E7=B4=A2=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ma-crud/components/column.vue  | 38 +++++++++++++------
 src/components/ma-crud/components/setting.vue | 10 ++++-
 src/components/ma-crud/index.vue              |  6 ++-
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/components/ma-crud/components/column.vue b/src/components/ma-crud/components/column.vue
index 3614c3a4..74190979 100644
--- a/src/components/ma-crud/components/column.vue
+++ b/src/components/ma-crud/components/column.vue
@@ -119,10 +119,10 @@
           </template>
           <template v-else-if="row.customRender">
             <custom-render
-                :column="column"
-                :record="record"
-                :render="row.customRender"
-                :rowIndex="rowIndex"
+              :column="column"
+              :record="record"
+              :render="row.customRender"
+              :rowIndex="rowIndex"
             ></custom-render>
           </template>
           <slot :name="row.dataIndex" v-bind="{ record, column, rowIndex }" v-else>
@@ -131,10 +131,13 @@
               <template v-if="row.isEdit">
                 <a-form>
                   <a-button-group class="flex">
-                    <a-input />
+                    <a-input v-if="row?.formType === undefined || row.formType === 'input'" v-bind="row" v-model="record[row.dataIndex]" />
+                    <a-input-number v-if="row.formType === 'input-number'" v-bind="row" v-model="record[row.dataIndex]" />
+                    <a-select v-if="['select', 'radio'].includes(row.formType)" v-bind="row" v-model="record[row.dataIndex]" :options="dicts[row.dataIndex]" />
                     <a-link
+                      class="block"
                       v-if="row?.quickEdit && allowQuickEdit(row.formType) && row.isEdit === true"
-                      @click="quickEdit(row, record, rowIndex)"
+                      @click="updateQuickEditData(row, record)"
                     >
                       <icon-check />
                     </a-link>
@@ -157,12 +160,12 @@
               <template v-else-if="row.formType === 'upload'">
                 <a-link @click="imageSee(row, record, row.dataIndex)"><icon-image /> 查看图片</a-link>
               </template>
-              <template v-else>{{ record[row.dataIndex] }} {{ row.formType }}</template>
+              <template v-else>{{ record[row.dataIndex] }}</template>
 
               <a-link
                 class="absolute top-1 right-0"
                 v-if="row?.quickEdit && allowQuickEdit(row.formType) && !row.isEdit"
-                @click="quickEdit(row, record, rowIndex)"
+                @click="quickEdit(row, record)"
               >
                 <icon-edit />
               </a-link>
@@ -194,6 +197,7 @@ const props = defineProps({
 })
 const options = inject('options')
 const requestParams = inject('requestParams')
+const dicts = inject('dicts')
 const dictTrans = inject('dictTrans')
 const dictColors = inject('dictColors')
 
@@ -267,13 +271,25 @@ const editAction = record => {
   }
 }
 
-const allowQuickEdit = (formType) => ['select', 'input', 'input-number', 'date'].includes(formType ?? 'input')
+const allowQuickEdit = (formType) => ['select', 'input', 'input-number', 'radio'].includes(formType ?? 'input')
 
-const quickEdit = (row, record, index) => {
-  console.log(props.crudFormRef.form)
+const quickEdit = (row, record) => {
+  if (row.formType === 'select' || row.formType === 'radio') {
+    record[row.dataIndex] = record[row.dataIndex].toString()
+  }
   row.isEdit = true
 }
 
+const updateQuickEditData = async (row, record) => {
+  if (isFunction(options.beforeEdit) && ! await options.beforeEdit(record)) {
+    return false
+  }
+  const response = await options.edit.api(record[options.pk], record)
+  row.isEdit = false
+  isFunction(options.afterEdit) && await options.afterEdit(response, record)
+  Message.success(response.message || `修改成功！`)
+}
+
 const recoveryAction = async record => {
   const response = await options.recovery.api({ ids: [record[options.pk]] })
   response.success && Message.success(response.message || `恢复成功！`)
diff --git a/src/components/ma-crud/components/setting.vue b/src/components/ma-crud/components/setting.vue
index eec2e59b..a552a095 100644
--- a/src/components/ma-crud/components/setting.vue
+++ b/src/components/ma-crud/components/setting.vue
@@ -57,7 +57,10 @@
               <span v-else> / </span>
           </template>
         </a-table-column>
-        <a-table-column title="隐藏" data-index="hide" align="center">
+        <a-table-column title="搜索" data-index="hide" align="center">
+          <template #cell="{ record }"><a-checkbox v-model="record.search" @change="changeColumn($event, 'search', record.dataIndex)" /></template>
+        </a-table-column>
+        <a-table-column title="表格" data-index="hide" align="center">
           <template #cell="{ record }"><a-checkbox v-model="record.hide" @change="changeColumn($event, 'hide', record.dataIndex)" /></template>
         </a-table-column>
         <a-table-column title="固定" data-index="fixed" align="center">
@@ -92,6 +95,8 @@ const options = inject('options')
 const columns = inject('columns')
 const allowShowColumns = ref([])
 
+const emit = defineEmits([ 'onChangeSearchHide' ])
+
 const setShowColumns = () => {
   allowShowColumns.value = columns.value.filter(item => {
     return ! (item?.settingHide ?? false)
@@ -122,6 +127,9 @@ const changeColumn = (ev, type, name) => {
         column.sortable = undefined
       }
       break
+    case 'search':
+      emit('onChangeSearchHide')
+      break
   }
 }
 
diff --git a/src/components/ma-crud/index.vue b/src/components/ma-crud/index.vue
index a6507099..ce7bf3c4 100644
--- a/src/components/ma-crud/index.vue
+++ b/src/components/ma-crud/index.vue
@@ -236,7 +236,11 @@
       />
     </div>
 
-    <ma-setting ref="crudSettingRef" />
+    <ma-setting
+      ref="crudSettingRef"
+      @onChangeSearchHide="initSearchColumns()"
+      @onChangeColumnHide="changeColumn"
+    />
 
     <ma-form ref="crudFormRef" @success="requestSuccess">
       <template v-for="slot in Object.keys($slots)" #[slot]="component">