Browse Source

优化Fieldlist组件
优化上传图片顺序
优化Composer依赖

Karson 4 years ago
parent
commit
e1fe326597

+ 5 - 2
composer.json

@@ -18,9 +18,12 @@
         "php": ">=7.1.0",
         "topthink/framework": "dev-master",
         "topthink/think-captcha": "^1.0",
+        "topthink/think-installer": "^1.0.14",
+        "topthink/think-queue": "1.1.6",
+        "topthink/think-helper": "^1.0.7",
         "karsonzhang/fastadmin-addons": "~1.2.4",
-        "overtrue/pinyin": "~3.0",
-        "phpoffice/phpspreadsheet": "^1.2",
+        "overtrue/pinyin": "^3.0",
+        "phpoffice/phpspreadsheet": "1.12",
         "overtrue/wechat": "4.2.11",
         "nelexa/zip": "^3.3",
         "ext-json": "*",

File diff suppressed because it is too large
+ 1 - 1
public/assets/css/backend.min.css


File diff suppressed because it is too large
+ 1 - 1
public/assets/css/frontend.min.css


File diff suppressed because it is too large
+ 93 - 93
public/assets/js/require-backend.min.js


+ 3 - 3
public/assets/js/require-form.js

@@ -325,7 +325,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                         //追加控制
                         $(".fieldlist", form).on("click", ".btn-append,.append", function (e, row) {
                             var container = $(this).closest(".fieldlist");
-                            var tagName = container.data("tag") || "dd";
+                            var tagName = container.data("tag") || (container.is("table") ? "tr" : "dd");
                             var index = container.data("index");
                             var name = container.data("name");
                             var template = container.data("template");
@@ -341,14 +341,14 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                         //移除控制
                         $(".fieldlist", form).on("click", ".btn-remove", function () {
                             var container = $(this).closest(".fieldlist");
-                            var tagName = container.data("tag") || "dd";
+                            var tagName = container.data("tag") || (container.is("table") ? "tr" : "dd");
                             $(this).closest(tagName).remove();
                             refresh(container.data("name"));
                         });
                         //渲染数据&拖拽排序
                         $(".fieldlist", form).each(function () {
                             var container = this;
-                            var tagName = $(this).data("tag") || "dd";
+                            var tagName = $(this).data("tag") || ($(this).is("table") ? "tr" : "dd");
                             $(this).dragsort({
                                 itemSelector: tagName,
                                 dragSelector: ".btn-dragsort",

File diff suppressed because it is too large
+ 93 - 93
public/assets/js/require-frontend.min.js


+ 1 - 0
public/assets/js/require-upload.js

@@ -199,6 +199,7 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
                             acceptedFiles: mimetype,
                             maxFiles: (maxcount && parseInt(maxcount) > 1 ? maxcount : (multiple ? null : 1)),
                             timeout: timeout,
+                            parallelUploads: 1,
                             previewsContainer: false,
                             dictDefaultMessage: __("Drop files here to upload"),
                             dictFallbackMessage: __("Your browser does not support drag'n'drop file uploads"),