rabin 8 年之前
父节点
当前提交
80214d1a74
共有 3 个文件被更改,包括 31 次插入22 次删除
  1. 19 13
      assets/public/layui/upload.js
  2. 3 0
      src/Database.php
  3. 9 9
      src/Lib/Input.php

+ 19 - 13
assets/public/layui/upload.js

@@ -15,8 +15,8 @@ function loadUpload(i,e,key,upload,assets)
 		var layuiUpload = layui.upload;
 		var layuiUpload = layui.upload;
 		var uploadInst = layuiUpload.render({
 		var uploadInst = layuiUpload.render({
 			elem: '#' + id
 			elem: '#' + id
-			,data: {'key' : key}
-			,field: 'file'
+			,data: {'title' : key}
+			,field: 'Filedata'
 			,url: upload
 			,url: upload
 			,multiple: true
 			,multiple: true
 			,done: function(data) {
 			,done: function(data) {
@@ -60,6 +60,10 @@ function loadUpload(i,e,key,upload,assets)
 							
 							
 						} else {
 						} else {
 							$('#show_'+value).attr('src',data.url).show();
 							$('#show_'+value).attr('src',data.url).show();
+							$('#show_'+value).click(function()
+							{
+								picDel($(this), value, 1);
+							})
 						}
 						}
 						//$("#"+file.id).find('.data').html('上传完毕');
 						//$("#"+file.id).find('.data').html('上传完毕');
 						$('#'+value).val(data.url);
 						$('#'+value).val(data.url);
@@ -75,19 +79,21 @@ function loadUpload(i,e,key,upload,assets)
 		});
 		});
 	});
 	});
 }
 }
-function picDel(e,v)
+function picDel(e,v,s)
 {
 {
-	if(confirm('确定要删除图片吗?'))
-	{
-		if(upload_pic.length <= 0 && $("#" + v).val())
-		{
-			upload_pic = $("#" + v).val().split(',');
+	if (confirm('确定要删除图片吗?')) {
+		if (s == 1) {
+			e.hide();
+			$("#" + v).val('');
+		} else {
+			if (upload_pic.length <= 0 && $("#" + v).val()) {
+				upload_pic = $("#" + v).val().split(',');
+			}
+			var p = e.find('img').attr('src');
+			e.remove();
+			upload_pic.remove(p);
+			$("#" + v).val(upload_pic.join(','));
 		}
 		}
-		var p = e.find('img').attr('src');
-		e.remove();
-		upload_pic.remove(p);
-		//console.info(pic);
-		$("#" + v).val(upload_pic.join(','));
 	}
 	}
 }
 }
 
 

+ 3 - 0
src/Database.php

@@ -2069,6 +2069,9 @@ class Database
             $i = 0;
             $i = 0;
             $c = array();
             $c = array();
             foreach ($input as $k => $v) {
             foreach ($input as $k => $v) {
+                if (!$v) {
+                    $v = 'null';
+                }
                 if ($v && is_string($v) && strpos($v, 'copy.') !== false) {
                 if ($v && is_string($v) && strpos($v, 'copy.') !== false) {
                     $temp = str_replace('copy.', '', $v);
                     $temp = str_replace('copy.', '', $v);
                     if (isset($input['update_' . $temp])) {
                     if (isset($input['update_' . $temp])) {

+ 9 - 9
src/Lib/Input.php

@@ -106,9 +106,9 @@ class Input
             $pic = 'src="" style=display:none;';
             $pic = 'src="" style=display:none;';
         }
         }
         return '<input type="button" style="width:10%;" class="form-control image_upload" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="选择文件"/>
         return '<input type="button" style="width:10%;" class="form-control image_upload" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="选择文件"/>
-		<div style="margin:10px;">
-		<img ' . $pic . ' class="update_value" update_type="src" id="show_' . $param['name'] . '_' . $param['index'] . '" width="150" /></div>
-		<input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
+        <div style="margin:10px;">
+        <img ' . $pic . ' onclick="picDel($(this), \'' . $param['name'] . '_' . $param['index'] . '\', 1);" class="update_value" update_type="src" id="show_' . $param['name'] . '_' . $param['index'] . '" width="150" /></div>
+        <input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
     }
     }
 
 
     /**
     /**
@@ -126,9 +126,9 @@ class Input
             }
             }
         }
         }
         return '<input type="button" style="width:10%;" class="form-control image_upload" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="选择文件"/>
         return '<input type="button" style="width:10%;" class="form-control image_upload" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="选择文件"/>
-		<div style="margin:10px;" update_type="html"  class="update_value ' . $param['name'] . '_' . $param['index'] . '_mul">' . $pic . '</div>
+        <div style="margin:10px;" update_type="html"  class="update_value ' . $param['name'] . '_' . $param['index'] . '_mul">' . $pic . '</div>
 
 
-		<input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
+        <input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
     }
     }
 
 
     /**
     /**
@@ -139,8 +139,8 @@ class Input
     public static function upload($param)
     public static function upload($param)
     {
     {
         return '<input type="file" style="width:10%;" class="form-control image_upload" t="file" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '"/>
         return '<input type="file" style="width:10%;" class="form-control image_upload" t="file" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '"/>
-		<div><input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">
-		</div>';
+        <div><input type="text" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">
+        </div>';
         //return '<input type="file" class="form-control" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '" name="' . $param['name'] . '"/>';
         //return '<input type="file" class="form-control" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '" name="' . $param['name'] . '"/>';
     }
     }
 
 
@@ -162,9 +162,9 @@ class Input
 
 
         return '<input type="file" style="width:10%;" class="form-control image_upload" t="file" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '"/>
         return '<input type="file" style="width:10%;" class="form-control image_upload" t="file" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '"/>
 
 
-		<ul style="margin:10px;" update_type="html"  class="update_value ' . $param['name'] . '_' . $param['index'] . '_mul">' . $file . '</ul>
+        <ul style="margin:10px;" update_type="html"  class="update_value ' . $param['name'] . '_' . $param['index'] . '_mul">' . $file . '</ul>
 
 
-		<input type="hidden" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
+        <input type="hidden" class="update_value form-control ' . (isset($param['valid']) ? $param['valid'] : '') . '" name="' . $param['name'] . '" id="' . $param['name'] . '_' . $param['index'] . '" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '">';
         //return '<input type="file" class="form-control" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '" name="' . $param['name'] . '"/>';
         //return '<input type="file" class="form-control" value="' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '" name="' . $param['name'] . '"/>';
     }
     }