From dcdc7bbe3bee3dca868d63859af1f6a0095adda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Wed, 12 Jul 2023 21:18:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98,?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2,?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6TF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.权限编辑提交时,值不变问题;
2.恢复文件管理页面;
3.查询时T/F后台报错问题;
---
 web/src/utils/service.ts                      |  12 +-
 web/src/views/system/fileList/index.vue       | 162 ++----------------
 .../system/menu/components/menuButton/api.ts  |   2 +-
 .../menu/components/menuButton/crud.tsx       |   2 +-
 4 files changed, 26 insertions(+), 152 deletions(-)

diff --git a/web/src/utils/service.ts b/web/src/utils/service.ts
index b791810..9a347f8 100644
--- a/web/src/utils/service.ts
+++ b/web/src/utils/service.ts
@@ -24,12 +24,12 @@ function createService() {
 			serialize(params) {
 				return qs.stringify(params, {
 					indices: false,
-					// encoder: (val: string) => {
-					// 	if (typeof val === 'boolean') {
-					// 		return val ? 1 : 0;
-					// 	}
-					// 	return val;
-					// },
+					encoder: (val: string) => {
+						if (typeof val === 'boolean') {
+							return val ? 'True' : 'False';
+						}
+						return val;
+					},
 				});
 			},
 		},
diff --git a/web/src/views/system/fileList/index.vue b/web/src/views/system/fileList/index.vue
index 5f04111..119c73a 100644
--- a/web/src/views/system/fileList/index.vue
+++ b/web/src/views/system/fileList/index.vue
@@ -1,152 +1,26 @@
 <template>
   <fs-page>
-      <el-row style="margin: 10px">
-        <el-col :span="6" :offset="18">
-          <el-input
-              class="w-60"
-              placeholder="请输入名称"
-              v-model="fileParams.name"
-              @keyup.enter="getData"
-              clearable
-              @blur="getData"
-          >
-            <template #append>
-              <el-button :icon="Search" @click="getData">
-              </el-button>
-            </template>
-          </el-input>
-        </el-col>
-      </el-row>
-    <el-row :gutter="10" style="height: 65vh;margin: 10px">
-      <el-col :span="3" v-for="(item,index) in fileList" :key="index">
-        <el-card>
-          <el-image
-              style="width: 150px; height: 150px"
-              :src="formatImgUrl(item.url)"
-              :zoom-rate="1.2"
-              :preview-src-list="[formatImgUrl(item.url)]"
-              :initial-index="4"
-              fit="fill"
-          />
-          <div>
-            <el-text>{{ item.name }}</el-text>
-          </div>
-          <div>
-            <el-popover
-                placement="bottom"
-                :width="500"
-                trigger="click"
-            >
-              <template #reference>
-                <el-button type="text">详细</el-button>
-              </template>
-              <div>
-                <el-descriptions
-                    :column="2"
-                    border
-                >
-                  <el-descriptions-item label="文件名称">{{ item.name }}</el-descriptions-item>
-                  <el-descriptions-item label="创建人">{{ item.creator_name }}</el-descriptions-item>
-                  <el-descriptions-item label="存储引擎">{{ item.engine }}</el-descriptions-item>
-                  <el-descriptions-item label="创建时间">{{ item.create_datetime }}</el-descriptions-item>
-                </el-descriptions>
-              </div>
-            </el-popover>
-            <el-popconfirm title="您确定要删除?" @confirm="onDel(item)">
-              <template #reference>
-                <el-button type="text">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-divider></el-divider>
-    <el-row style="margin-left: 10px">
-      <el-col :span="12" >
-        <el-pagination
-            v-model:current-page="pageConfig.page"
-            v-model:page-size="pageConfig.limit"
-            background
-            :page-sizes="[5, 10, 20, 50]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="pageConfig.total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-        />
-      </el-col>
-    </el-row>
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
   </fs-page>
 </template>
 
-<script lang="ts" setup name="fileList">
-import {DelObj, GetList} from "./api";
-import {ref, onMounted,reactive} from "vue";
-import {getBaseURL} from "/@/utils/baseUrl";
-import {ElMessage} from "element-plus";
-import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue'
-const fileParams = reactive({name:''})
-const fileList = ref([])
-const mimeType = ref([])
-const pageConfig = reactive({
-  page:1,
-  limit:10,
-  total:0
-})
-const getData = function () {
-  let params = {
-    page:pageConfig.page,
-    limit:pageConfig.limit,
-    name:fileParams.name
-  }
-  GetList(params).then((res: any) => {
-    const {data,page,limit,total} = res
-    pageConfig.page = page
-    pageConfig.limit=limit
-    pageConfig.total=total
-    fileList.value = data
-  })
-}
-
-
-const onDel = function (item: any) {
-  DelObj(item.id).then((res: any) => {
-    ElMessage.success("删除成功！");
-    getData()
-  })
-}
-const formatImgUrl = function (src: string) {
-  return getBaseURL() + src
-}
-
-const handleSizeChange = function (val: any) {
-  pageConfig.limit = val
-  getData()
-}
-
-const handleCurrentChange = function (val: any) {
-  pageConfig.page = val
-  getData()
-}
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue';
+import { useExpose, useCrud } from '@fast-crud/fast-crud';
+import { createCrudOptions } from './crud';
+// crud组件的ref
+const crudRef = ref();
+// crud 配置的ref
+const crudBinding = ref();
+// 暴露的方法
+const { crudExpose } = useExpose({ crudRef, crudBinding });
+// 你的crud配置
+const { crudOptions } = createCrudOptions({ crudExpose });
+// 初始化crud配置
+const { resetCrudOptions } = useCrud({ crudExpose, crudOptions });
 
+// 页面打开后获取列表数据
 onMounted(() => {
-  getData()
-})
+  crudExpose.doRefresh();
+});
 </script>
-<style scoped>
-.demo-tabs > .el-tabs__content {
-  padding: 32px;
-  color: #6b778c;
-  font-size: 32px;
-  font-weight: 600;
-}
-
-.el-tabs--right .el-tabs__content,
-.el-tabs--left .el-tabs__content {
-  height: 100%;
-}
-
-.el-tabs__nav-scroll {
-  border-right: 1px solid #efefef;
-}
-</style>
diff --git a/web/src/views/system/menu/components/menuButton/api.ts b/web/src/views/system/menu/components/menuButton/api.ts
index 5db63a9..bc473fc 100644
--- a/web/src/views/system/menu/components/menuButton/api.ts
+++ b/web/src/views/system/menu/components/menuButton/api.ts
@@ -24,7 +24,7 @@ export function AddObj(obj: AddReq) {
 	});
 }
 
-export function UpdateObj(obj: EditReq) {
+export function UpdateObj(obj: any) {
 	return request({
 		url: apiPrefix + obj.id + '/',
 		method: 'put',
diff --git a/web/src/views/system/menu/components/menuButton/crud.tsx b/web/src/views/system/menu/components/menuButton/crud.tsx
index 59dad16..c8d2ec8 100644
--- a/web/src/views/system/menu/components/menuButton/crud.tsx
+++ b/web/src/views/system/menu/components/menuButton/crud.tsx
@@ -24,7 +24,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 
 	};
 	const editRequest = async ({ form, row }: EditReq) => {
-		return await api.UpdateObj(row);
+		return await api.UpdateObj({ ...form, menu: row.menu });
 	};
 	const delRequest = async ({ row }: DelReq) => {
 		return await api.DelObj(row.id);