Crud upweight一键菜单配置中增加拖拽排序

src/plugin/admin/app/common/Util.php

@@ -14,6 +14,8 @@
 
 class Util
 {
+    static public $curdIsSort = false;// 控制是否启用排序（只有在一键生成菜单时才启用排序）
+
     /**
      * 密码哈希
      * @param $password
@@ -436,12 +438,32 @@ public static function getSchema($table, $section = null)
         foreach ($data['forms'] as $field => $item) {
             if (isset($form_schema_map[$field])) {
                 $data['forms'][$field] = $form_schema_map[$field];
+                if(self::$curdIsSort)
+                    $data['columns'][$field]['_weight_'] = $form_schema_map[$field]['_weight_']?:0;
             }
         }
-
+        if(self::$curdIsSort){
+            // 按照我们内置的字段 进行排序
+            $data['forms'] = self::arraySort(array_values($data['forms']),'_weight_',SORT_ASC);
+            $data['columns'] = self::arraySort(array_values($data['columns']),'_weight_',SORT_ASC);
+        }
         return $section ? $data[$section] : $data;
     }
-
+    /**
+     * 二维数组根据某个字段排序
+     * @param array $array 要排序的数组
+     * @param string $keys   要排序的键字段
+     * @param string $sort  排序类型  SORT_ASC     SORT_DESC
+     * @return array 排序后的数组
+     */
+    protected static function arraySort($array, $keys, $sort = SORT_DESC) {
+        $keysValue = [];
+        foreach ($array as $k => $v) {
+            $keysValue[$k] = $v[$keys];
+        }
+        array_multisort($keysValue, $sort, $array);
+        return $array;
+    }
     /**
      * 获取字段长度或默认值
      * @param $schema

src/plugin/admin/app/controller/TableController.php

@@ -416,6 +416,8 @@ public function crud(Request $request): Response
         $controller_file = '/' . trim($request->post('controller', ''), '/');
         $model_file = '/' . trim($request->post('model', ''), '/');
         $overwrite = $request->post('overwrite');
+        $ismodel = $request->post('ismodel');
+
         if ($controller_file === '/' || $model_file === '/') {
             return $this->json(1, '控制器和model不能为空');
         }
@@ -441,7 +443,7 @@ public function crud(Request $request): Response
         }
 
         if (!$overwrite) {
-            if (is_file(base_path($controller_file))) {
+            if (!$ismodel && is_file(base_path($controller_file))) {
                 return $this->json(1, "$controller_file 已经存在");
             }
             if (is_file(base_path($model_file))) {
@@ -480,6 +482,11 @@ public function crud(Request $request): Response
 
             // 创建model
             $this->createModel($model_class, $model_namespace, base_path($model_file), $table_name);
+            // 仅生成模型
+            if($ismodel){
+                Util::resumeFileMonitor();
+                return $this->json(0);
+            }
 
             $controller_suffix = $plugin ? config("plugin.$plugin.app.controller_suffix") : config('app.controller_suffix');
             $controller_class = $controller_file_name;
@@ -512,7 +519,10 @@ public function crud(Request $request): Response
             $model_class_with_namespace = "$model_namespace\\$model_class";
             $primary_key = (new $model_class_with_namespace)->getKeyName();
             $url_path_base = ($plugin ? "/app/$plugin/" : '/') . ($app ? "$app/" : '') . $template_path;
+            Util::$curdIsSort = true;// 后续查询均使用排序
             $this->createTemplate(base_path($template_file_path), $table_name, $url_path_base, $primary_key, "$controller_namespace\\$controller_class");
+            Util::$curdIsSort = false;// 关闭 防止静态类不会销毁产生的错误
+
         } finally {
             Util::resumeFileMonitor();
         }

src/plugin/admin/app/view/table/crud.html

@@ -51,9 +51,14 @@
                     </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">强制覆盖</label>
-                        <div class="layui-input-block">
+                        <div class="layui-input-inline" style="width: 20px">
                             <input type="checkbox" name="overwrite" lay-skin="primary">
                         </div>
+
+                        <label class="layui-form-label">仅生成模型</label>
+                        <div class="layui-input-inline"  style="width: 20px">
+                            <input type="checkbox" name="ismodel" lay-skin="primary">
+                        </div>
                     </div>
                 </div>
             </div>