From 01b6102719255dabee4da029983f3ed87f2dc789 Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Tue, 6 Dec 2022 19:43:09 +0800
Subject: [PATCH] save

---
 src/plugin/admin/app/common/LayuiForm.php     |  4 +-
 .../admin/app/controller/TableController.php  | 98 +++++++++----------
 src/plugin/admin/app/model/Upload.php         |  6 +-
 src/plugin/admin/app/view/upload/index.html   | 62 +++++++-----
 4 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/src/plugin/admin/app/common/LayuiForm.php b/src/plugin/admin/app/common/LayuiForm.php
index 2b40088..2fc3d2a 100644
--- a/src/plugin/admin/app/common/LayuiForm.php
+++ b/src/plugin/admin/app/common/LayuiForm.php
@@ -816,8 +816,8 @@ EOF;
                 $props = Util::getProps($info['control'], $info['control_args']);
 
                 if (isset($props['url'])) {
-                    $api .= "apis.push(['$field', '{$props['url']}']);";
-                    $api_result .= "apiResults['$field'] = [];";
+                    $api .= "apis.push(['$field', '{$props['url']}']);\r\n";
+                    $api_result .= "apiResults['$field'] = [];\r\n";
                 } else if (!empty($props['data'])) {
                     $options = [];
                     foreach ($props['data'] as $option) {
diff --git a/src/plugin/admin/app/controller/TableController.php b/src/plugin/admin/app/controller/TableController.php
index 3cae272..020c7e6 100644
--- a/src/plugin/admin/app/controller/TableController.php
+++ b/src/plugin/admin/app/controller/TableController.php
@@ -775,8 +775,8 @@ EOF
         <script>
 
             // 相关常量
-            const PRIMARY_KEY = '$primary_key';
-            const CONTROLLER = '$controller_class_with_namespace';
+            const PRIMARY_KEY = "$primary_key";
+            const CONTROLLER = "$controller_class_with_namespace";
             const SELECT_API = "$url_path_base/$template_path/select";
             const UPDATE_API = "$url_path_base/$template_path/update";
             const DELETE_API = "$url_path_base/$template_path/delete";
@@ -784,7 +784,7 @@ EOF
             const UPDATE_URL = "$url_path_base/$template_path/update";
             $js
             // 表格渲染
-            layui.use(['table', 'form', 'common', 'popup', 'util'], function() {
+            layui.use(["table", "form", "common", "popup", "util"], function() {
                 let table = layui.table;
                 let form = layui.form;
                 let $ = layui.$;
@@ -792,45 +792,45 @@ EOF
                 let util = layui.util;
                 $table_js
                 // 编辑或删除行事件
-                table.on('tool(data-table)', function(obj) {
-                    if (obj.event === 'remove') {
+                table.on("tool(data-table)", function(obj) {
+                    if (obj.event === "remove") {
                         remove(obj);
-                    } else if (obj.event === 'edit') {
+                    } else if (obj.event === "edit") {
                         edit(obj);
                     }
                 });
 
                 // 表格顶部工具栏事件
-                table.on('toolbar(data-table)', function(obj) {
-                    if (obj.event === 'add') {
+                table.on("toolbar(data-table)", function(obj) {
+                    if (obj.event === "add") {
                         add();
-                    } else if (obj.event === 'refresh') {
+                    } else if (obj.event === "refresh") {
                         refreshTable();
-                    } else if (obj.event === 'batchRemove') {
+                    } else if (obj.event === "batchRemove") {
                         batchRemove(obj);
                     }
                 });
 
                 // 表格顶部搜索事件
-                form.on('submit(table-query)', function(data) {
-                    table.reload('data-table', {
+                form.on("submit(table-query)", function(data) {
+                    table.reload("data-table", {
                         where: data.field
                     })
                     return false;
                 });
                 
                 // 表格顶部搜索重置事件
-                form.on('submit(table-reset)', function(data) {
-                    table.reload('data-table', {
+                form.on("submit(table-reset)", function(data) {
+                    table.reload("data-table", {
                         where: []
                     })
                 });
 
                 // 表格排序事件
-                table.on('sort(data-table)', function(obj){
-                    table.reload('data-table', {
+                table.on("sort(data-table)", function(obj){
+                    table.reload("data-table", {
                         initSort: obj,
-                        scrollPos: 'fixed',
+                        scrollPos: "fixed",
                         where: {
                             field: obj.field,
                             order: obj.type
@@ -842,9 +842,9 @@ EOF
                 let add = function() {
                     layer.open({
                         type: 2,
-                        title: '新增',
+                        title: "新增",
                         shade: 0.1,
-                        area: [common.isModile()?'100%':'500px', common.isModile()?'100%':'450px'],
+                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
                         content: INSERT_URL
                     });
                 }
@@ -854,10 +854,10 @@ EOF
                     let value = obj.data[PRIMARY_KEY];
                     layer.open({
                         type: 2,
-                        title: '修改',
+                        title: "修改",
                         shade: 0.1,
-                        area: [common.isModile()?'100%':'500px', common.isModile()?'100%':'450px'],
-                        content: UPDATE_URL + '?' + PRIMARY_KEY + '=' + value
+                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
+                        content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
                     });
                 }
 
@@ -870,33 +870,33 @@ EOF
                 let batchRemove = function(obj) {
                     let checkIds = common.checkField(obj, PRIMARY_KEY);
                     if (checkIds === "") {
-                        layui.popup.warning('未选中数据');
+                        layui.popup.warning("未选中数据");
                         return false;
                     }
-                    doRemove(checkIds.split(','));
+                    doRemove(checkIds.split(","));
                 }
 
                 // 执行删除
                 let doRemove = function (ids) {
                     let data = {};
                     data[PRIMARY_KEY] = ids;
-                    layer.confirm('确定删除?', {
+                    layer.confirm("确定删除?", {
                         icon: 3,
-                        title: '提示'
+                        title: "提示"
                     }, function(index) {
                         layer.close(index);
                         let loading = layer.load();
                         $.ajax({
                             url: DELETE_API,
                             data: data,
-                            dataType: 'json',
-                            type: 'post',
+                            dataType: "json",
+                            type: "post",
                             success: function(res) {
                                 layer.close(loading);
                                 if (res.code) {
                                     return layui.popup.failure(res.msg);
                                 }
-                                return layui.popup.success('操作成功', refreshTable);
+                                return layui.popup.success("操作成功", refreshTable);
                             }
                         })
                     });
@@ -904,8 +904,8 @@ EOF
 
                 // 刷新表格数据
                 window.refreshTable = function(param) {
-                    table.reloadData('data-table', {
-                        scrollPos: 'fixed'
+                    table.reloadData("data-table", {
+                        scrollPos: "fixed"
                     });
                 }
             })
@@ -961,18 +961,18 @@ EOF;
             const INSERT_API = "$url_path_base/$template_path/insert";
             $js
             //提交事件
-            layui.use(['form', 'popup'], function () {
-                layui.form.on('submit(save)', function (data) {
+            layui.use(["form", "popup"], function () {
+                layui.form.on("submit(save)", function (data) {
                     layui.$.ajax({
                         url: INSERT_API,
-                        type: 'POST',
-                        dateType: 'json',
+                        type: "POST",
+                        dateType: "json",
                         data: data.field,
                         success: function (res) {
                             if (res.code) {
                                 return layui.popup.failure(res.msg);
                             }
-                            return layui.popup.success('操作成功', function () {
+                            return layui.popup.success("操作成功", function () {
                                 parent.refreshTable();
                                 parent.layer.close(parent.layer.getFrameIndex(window.name));
                             });
@@ -1031,30 +1031,30 @@ EOF;
         <script>
 
             // 相关接口
-            const PRIMARY_KEY = '$primary_key';
+            const PRIMARY_KEY = "$primary_key";
             const SELECT_API = "$url_path_base/$template_path/select" + location.search;
             const UPDATE_API = "$url_path_base/$template_path/update";
 
             // 获取数据库记录
-            layui.use(['form', 'util'], function () {
+            layui.use(["form", "util"], function () {
                 let $ = layui.$;
                 $.ajax({
                     url: SELECT_API,
-                    dataType: 'json',
+                    dataType: "json",
                     success: function (e) {
                         
                         // 给表单初始化数据
                         layui.each(e.data[0], function (key, value) {
                             let obj = $('*[name="'+key+'"]');
-                            if (key === 'password') {
-                                obj.attr('placeholder', '不更新密码请留空');
+                            if (key === "password") {
+                                obj.attr("placeholder", "不更新密码请留空");
                                 return;
                             }
-                            if (typeof obj[0] === 'undefined' || !obj[0].nodeName) return;
-                            if (obj[0].nodeName.toLowerCase() === 'textarea') {
+                            if (typeof obj[0] === "undefined" || !obj[0].nodeName) return;
+                            if (obj[0].nodeName.toLowerCase() === "textarea") {
                                 obj.val(layui.util.escape(value));
                             } else {
-                                obj.attr('value', value);
+                                obj.attr("value", value);
                             }
                         });
                         $js
@@ -1064,19 +1064,19 @@ EOF;
             });
 
             //提交事件
-            layui.use(['form', 'popup'], function () {
-                layui.form.on('submit(save)', function (data) {
+            layui.use(["form", "popup"], function () {
+                layui.form.on("submit(save)", function (data) {
                     data.field[PRIMARY_KEY] = layui.url().search[PRIMARY_KEY];
                     layui.$.ajax({
                         url: UPDATE_API,
-                        type: 'POST',
-                        dateType: 'json',
+                        type: "POST",
+                        dateType: "json",
                         data: data.field,
                         success: function (res) {
                             if (res.code) {
                                 return layui.popup.failure(res.msg);
                             }
-                            return layui.popup.success('操作成功', function () {
+                            return layui.popup.success("操作成功", function () {
                                 parent.refreshTable();
                                 parent.layer.close(parent.layer.getFrameIndex(window.name));
                             });
diff --git a/src/plugin/admin/app/model/Upload.php b/src/plugin/admin/app/model/Upload.php
index 5061735..c82d0c5 100644
--- a/src/plugin/admin/app/model/Upload.php
+++ b/src/plugin/admin/app/model/Upload.php
@@ -6,10 +6,10 @@ use plugin\admin\app\model\Base;
 
 /**
  * @property integer $id 主键(主键)
- * @property string $name 名字
+ * @property string $name 名称
  * @property string $url url
- * @property integer $admin_id 管理员id
- * @property integer $user_id 用户id
+ * @property integer $admin_id 管理员
+ * @property integer $user_id 用户
  * @property integer $file_size 文件大小
  * @property string $mime_type mime类型
  * @property integer $image_width 图片宽度
diff --git a/src/plugin/admin/app/view/upload/index.html b/src/plugin/admin/app/view/upload/index.html
index 9cd4050..f5df0b9 100644
--- a/src/plugin/admin/app/view/upload/index.html
+++ b/src/plugin/admin/app/view/upload/index.html
@@ -13,34 +13,34 @@
         <div class="layui-card">
             <div class="layui-card-body">
                 <form class="layui-form top-search-from">
-                    
+
                     <div class="layui-form-item">
-                        <label class="layui-form-label">主键</label>
+                        <label class="layui-form-label">类别</label>
                         <div class="layui-input-block">
-                            <input type="number" name="id" value="" class="layui-input">
+                            <div name="category" id="category" value="" ></div>
                         </div>
                     </div>
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">名字</label>
                         <div class="layui-input-block">
                             <input type="text" name="name" value="" class="layui-input">
                         </div>
                     </div>
-                    
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">管理员id</label>
-                        <div class="layui-input-block">
-                            <input type="number" name="admin_id" value="" class="layui-input">
-                        </div>
-                    </div>
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">扩展名</label>
                         <div class="layui-input-block">
                             <input type="text" name="ext" value="" class="layui-input">
                         </div>
                     </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">管理员</label>
+                        <div class="layui-input-block">
+                            <div name="admin_id" id="admin_id" value="" ></div>
+                        </div>
+                    </div>
                     
                     <div class="layui-form-item">
                         <label class="layui-form-label">上传时间</label>
@@ -53,13 +53,6 @@
                         </div>
                     </div>
                     
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">类别</label>
-                        <div class="layui-input-block">
-                            <div name="category" id="category" value="" ></div>
-                        </div>
-                    </div>
-                    
                     <div class="layui-form-item layui-inline">
                         <label class="layui-form-label"></label>
                         <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="table-query">
@@ -122,6 +115,27 @@
                     type: 'datetime',
                 });
             })
+
+            // 字段 管理员 admin_id
+            layui.use(["jquery", "xmSelect"], function() {
+                layui.$.ajax({
+                    url: "/app/admin/admin/select?format=select",
+                    dataType: "json",
+                    success: function (e) {
+                        let value = layui.$("#admin_id").attr("value");
+                        let initValue = value ? value.split(",") : [];
+                        layui.xmSelect.render({
+                            el: "#admin_id",
+                            name: "admin_id",
+                            initValue: initValue,
+                            data: e.data,
+                            model: {"icon":"hidden","label":{"type":"text"}},
+                            clickClose: 'true',
+                            radio: 'true',
+                        })
+                    }
+                });
+            });
             
             // 字段 类别 category
             layui.use(["jquery", "xmSelect"], function() {
@@ -256,10 +270,12 @@
 				}
 				
 				// 获取表格中下拉或树形组件数据
-				let apis = [];
-				apis.push(['category', '/app/admin/dict/get/upload']);
-				let apiResults = {};
-				apiResults['category'] = [];
+                let apis = [];
+                apis.push(['admin_id', '/app/admin/admin/select?format=select']);
+                apis.push(['category', '/app/admin/dict/get/upload']);
+                let apiResults = {};
+                apiResults['admin_id'] = [];
+                apiResults['category'] = [];
 				let count = apis.length;
 				layui.each(apis, function (k, item) {
 				    let [field, url] = item;