chore:移除unsignedDecimal类型

composer.json

@@ -11,19 +11,18 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-pdo": "*",
         "ext-zip": "*",
-        "doctrine/dbal": "^3.4",
+        "guzzlehttp/guzzle": "^7.8.1",
-        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^11.0",
-        "laravel/framework": "^10.0",
+        "laravel/tinker": "^v2.9.0",
-        "laravel/tinker": "^2.8",
+        "catchadmin/core": "^0.3.2"
-        "catchadmin/core": "^0.2.7"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.9.1",
+        "fakerphp/faker": "^v1.23.1",
-        "mockery/mockery": "^1.4.4",
+        "mockery/mockery": "^1.6.9",
-        "pestphp/pest": "^1.22"
+        "pestphp/pest": "^v2.34.2"
     },
     "autoload": {
         "psr-4": {

modules/Develop/Models/Schemas.php

@@ -6,8 +6,8 @@ use Catch\Base\CatchModel;
 use Catch\Enums\Status;
 use Exception;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\DB;
 use Modules\Develop\Support\Generate\Create\Schema;
+use Illuminate\Support\Facades\Schema as SchemaFacade;
 
 class Schemas extends CatchModel
 {
@@ -90,16 +90,13 @@ class Schemas extends CatchModel
     {
         $schema = parent::firstBy($id);
 
-        $columns = [];
+        foreach (SchemaFacade::getColumns($schema->name) as $column) {
-
-        foreach (getTableColumns($schema->name) as $columnString) {
-            $column = DB::connection()->getDoctrineColumn(DB::connection()->getTablePrefix().$schema->name, $columnString);
             $columns[] = [
-                'name' => $column->getName(),
+                'name' => $column['name'],
-                'type' => $column->getType()->getName(),
+                'type' => $column['type_name'],
-                'nullable' => ! $column->getNotnull(),
+                'nullable' => $column['nullable'],
-                'default' => $column->getDefault(),
+                'default' => $column['default'],
-                'comment' => $column->getComment()
+                'comment' => $column['comment'],
             ];
         }
 

modules/Develop/views/dymaic/create.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  $END$
+</template>
+
+<style scoped lang="scss">
+
+</style>

modules/Develop/views/schema/steps/structure.vue

@@ -1,27 +1,29 @@
 <template>
   <div>
-    <el-table :data="structures" class="draggable">
+      <VueDraggable v-model="structures" target=".el-table__body tbody" animation="150" @end="onEnd">
-      <el-table-column prop="field" :label="$t('generate.schema.structure.field_name.name')" />
+          <el-table :data="structures" class="draggable" :lazy="false">
-      <el-table-column prop="type" :label="$t('generate.schema.structure.type.name')">
+          <el-table-column prop="field" :label="$t('generate.schema.structure.field_name.name')" />
-        <template #default="scope">
+          <el-table-column prop="type" :label="$t('generate.schema.structure.type.name')">
-          <el-tag type="success">{{ scope.row.type }}</el-tag>
+            <template #default="scope">
-        </template>
+              <el-tag type="success">{{ scope.row.type }}</el-tag>
-      </el-table-column>
+            </template>
-      <el-table-column prop="nullable" :label="$t('generate.schema.structure.nullable')" width="90px">
+          </el-table-column>
-        <template #default="scope">
+          <el-table-column prop="nullable" :label="$t('generate.schema.structure.nullable')" width="90px">
-          <el-tag v-if="scope.row.nullable">{{ $t('system.yes') }}</el-tag>
+            <template #default="scope">
-          <el-tag v-else type="info">{{ $t('system.no') }}</el-tag>
+              <el-tag v-if="scope.row.nullable">{{ $t('system.yes') }}</el-tag>
-        </template>
+              <el-tag v-else type="info">{{ $t('system.no') }}</el-tag>
-      </el-table-column>
+            </template>
-      <el-table-column prop="default" :label="$t('generate.schema.structure.default')" />
+          </el-table-column>
-      <!--<el-table-column prop="comment" label="注释" />-->
+          <el-table-column prop="default" :label="$t('generate.schema.structure.default')" />
-      <el-table-column prop="id" :label="$t('generate.schema.structure.operate')" width="120px">
+          <!--<el-table-column prop="comment" label="注释" />-->
-        <template #default="scope">
+          <el-table-column prop="id" :label="$t('generate.schema.structure.operate')" width="120px">
-          <el-button type="primary" :icon="Edit" @click="updateField(scope.row.id)" size="small" />
+            <template #default="scope">
-          <el-button type="danger" :icon="Delete" @click="deleteField(scope.row.id)" size="small" />
+              <el-button type="primary" :icon="Edit" @click="updateField(scope.row.id)" size="small" />
-        </template>
+              <el-button type="danger" :icon="Delete" @click="deleteField(scope.row.id)" size="small" />
-      </el-table-column>
+            </template>
-    </el-table>
+          </el-table-column>
+        </el-table>
+    </VueDraggable>
 
     <div class="flex justify-end mt-4">
       <el-button type="success" :icon="Plus" @click="addField">{{ $t('system.add') }}</el-button>
@@ -88,21 +90,21 @@
   </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'
 import Message from '/admin/support/message'
 import http from '/admin/support/http'
 import { Code } from '/admin/enum/app'
+import { VueDraggable } from 'vue-draggable-plus'
 
 const schemaStore = useSchemaStore()
 const emits = defineEmits(['prev', 'next'])
 const visible = ref(false)
 
-const structures = computed(() => {
+// 初始化
-  return schemaStore.getStructures
+const structures = ref(schemaStore.getStructures)
-})
 
 const structure: Ref<Structure> = ref(schemaStore.initStructure())
 // structure
@@ -117,6 +119,8 @@ const updateField = (id: number) => {
       structure.value = s
     }
   })
+
+  schemaStore.setStructures(structures.value)
 }
 
 const form = ref<FormInstance>()
@@ -134,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 = () => {
@@ -149,7 +156,10 @@ const next = () => {
     })
   }
 }
-
+// 调整数据结构
+const onEnd = () => {
+    schemaStore.setStructures(structures.value)
+}
 const types: string[] = [
   'id',
   'smallIncrements',
@@ -201,7 +211,6 @@ const types: string[] = [
   'tinyIncrements',
   'tinyInteger',
   'tinyText',
-  'unsignedDecimal',
   'uuid',
   'year',
 ]

package.json

@@ -16,6 +16,7 @@
         "pinia": "^2.1.7",
         "terser": "^5.29.2",
         "vue": "^3.4.21",
+        "vue-draggable-plus": "^0.4.0",
         "vue-i18n": "9",
         "vue-router": "4.3.0",
         "vuedraggable": "^2.24.3"

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 }
+}