From dede7b0ba0335dcb3961ac6b523407abc14c3ead Mon Sep 17 00:00:00 2001
From: JaguarJack <82664165@qq.com>
Date: Mon, 22 Apr 2024 17:24:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=97=E6=AE=B5=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/Cms                                   |  1 -
 modules/Develop/views/dymaic/create.vue       | 11 +++
 .../Develop/views/schema/steps/structure.vue  | 10 ++-
 resources/admin/composables/upload.ts         | 85 +++++++++++++++++++
 4 files changed, 103 insertions(+), 4 deletions(-)
 delete mode 160000 modules/Cms
 create mode 100644 modules/Develop/views/dymaic/create.vue
 create mode 100644 resources/admin/composables/upload.ts

diff --git a/modules/Cms b/modules/Cms
deleted file mode 160000
index 36e9e66..0000000
--- a/modules/Cms
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36e9e66e38bb7b2fb1e92009c05a701e151ea034
diff --git a/modules/Develop/views/dymaic/create.vue b/modules/Develop/views/dymaic/create.vue
new file mode 100644
index 0000000..d35602e
--- /dev/null
+++ b/modules/Develop/views/dymaic/create.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  $END$
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/modules/Develop/views/schema/steps/structure.vue b/modules/Develop/views/schema/steps/structure.vue
index 0483b65..089afd5 100644
--- a/modules/Develop/views/schema/steps/structure.vue
+++ b/modules/Develop/views/schema/steps/structure.vue
@@ -90,7 +90,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { computed, Ref, ref } from 'vue'
+import { Ref, ref } from 'vue'
 import { useSchemaStore, Structure } from '../store'
 import { Delete, Plus, Edit } from '@element-plus/icons-vue'
 import type { FormInstance } from 'element-plus'
@@ -119,6 +119,8 @@ const updateField = (id: number) => {
       structure.value = s
     }
   })
+
+  schemaStore.setStructures(structures.value)
 }
 
 const form = ref<FormInstance>()
@@ -136,7 +138,10 @@ const submitStructure = (formEl: FormInstance | undefined) => {
 }
 
 const deleteField = (id: number) => {
-  schemaStore.filterStructures(id)
+    structures.value = structures.value.filter((s: Structure) => {
+        return !(s.id === id)
+    })
+    schemaStore.setStructures(structures.value)
 }
 
 const next = () => {
@@ -153,7 +158,6 @@ const next = () => {
 }
 // 调整数据结构
 const onEnd = () => {
-    console.log(structures.value)
     schemaStore.setStructures(structures.value)
 }
 const types: string[] = [
diff --git a/resources/admin/composables/upload.ts b/resources/admin/composables/upload.ts
new file mode 100644
index 0000000..b4a79ba
--- /dev/null
+++ b/resources/admin/composables/upload.ts
@@ -0,0 +1,85 @@
+import { ref } from 'vue'
+import { getFileExt, getFilename } from '@/form/support/helper'
+import { Code } from '@/form/enum/app'
+import Message from '@/form/support/message'
+import { genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+
+// 上传文件
+export function uploadFile(action: string, ext: Array<String>, isValidate: boolean = true) {
+  const upload = ref<UploadInstance>()
+
+  const file = ref<string>('')
+  const filename = ref<string>('')
+  const fileExtensions = ext.join('|')
+
+  // 上传前的钩子 判断文件类型
+  const beforeUpload = (file: UploadRawFile) => {
+    if (isValidate) {
+        const isCanUpload = ext.indexOf(getFileExt(file.name).substring(1)) > -1
+      if (!isCanUpload) {
+        Message.error('不符合上传文件类型，仅支持' + fileExtensions)
+      }
+      return isCanUpload
+    } else {
+      return true
+    }
+  }
+
+  const handleExceed: UploadProps['onExceed'] = files => {
+    upload.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    upload.value!.handleStart(file)
+    upload.value!.submit()
+  }
+
+  const handleSuccess = (response: any, uploadFile: any) => {
+    if (response.code === Code.SUCCESS) {
+      file.value = response.data.path
+      filename.value = getFilename(file.value)
+    } else {
+      Message.error(response.message)
+    }
+  }
+
+  return { upload, beforeUpload, handleExceed, handleSuccess, file, filename, fileExtensions }
+}
+
+// 上传图片
+// 上传文件
+export function uploadImage(action: string, extensions: Array<String>) {
+  const upload = ref<UploadInstance>()
+
+  const file = ref<string>('')
+  const filename = ref<string>('')
+  const fileExtensions = extensions
+
+  // 上传前的钩子 判断文件类型
+  const beforeUpload = (file: UploadRawFile) => {
+    const isCanUpload = fileExtensions.indexOf(getFileExt(file.name).substring(1)) > -1
+    if (!isCanUpload) {
+      Message.error('不符合上传文件类型，仅支持' + fileExtensions)
+    }
+    return isCanUpload
+  }
+
+  const handleExceed: UploadProps['onExceed'] = files => {
+    upload.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    upload.value!.handleStart(file)
+    upload.value!.submit()
+  }
+
+  const handleSuccess = (response: any, uploadFile: any) => {
+    if (response.code === Code.SUCCESS) {
+      file.value = response.data.path
+      filename.value = getFilename(file.value)
+    } else {
+      Message.error(response.message)
+    }
+  }
+
+  return { upload, beforeUpload, handleExceed, handleSuccess, file, filename, fileExtensions }
+}