rabin %!s(int64=5) %!d(string=hai) anos
pai
achega
71fe8fab74
Modificáronse 3 ficheiros con 51 adicións e 15 borrados
  1. 2 2
      assets/layadmin/html/inc/script.html
  2. 2 0
      src/Database.php
  3. 47 13
      src/Lib/Input.php

+ 2 - 2
assets/layadmin/html/inc/script.html

@@ -40,10 +40,10 @@
 <script type="text/javascript" src="../script/lib/qiniu/qiniu.upload.js"></script>
 <script type="text/javascript" src="../script/lib/tool/md5.js"></script>
 
-<script type="text/javascript" src="../script/lib/layui/upload.js?v6"></script>
+<script type="text/javascript" src="../script/lib/layui/upload.js?v7"></script>
 <script type="text/javascript" src="../script/lib/layui/layui.js"></script>
 
 <script type="text/javascript" src="../script/lib/clipboard/clipboard.js"></script>
 
 <!-- 加载主要js,很乱,后续优化 -->
-<script type="text/javascript" src="../script/lib/manage/main.js?v31"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?v32"></script>

+ 2 - 0
src/Database.php

@@ -2726,6 +2726,8 @@ class Database
                 if (isset($param['update_input']) && isset($data[$index . '_input'])) {
                     $param['update_input_data'] = explode(',', $data[$index . '_input']);
                 }
+                $param['project'] = $this->project;
+                $param['table'] = $this->table;
                 $result .= Html::$method($param);
             }
 

+ 47 - 13
src/Lib/Input.php

@@ -241,6 +241,31 @@ class Input
         return array($html, $type, $div, $style);
     }
 
+    private function uploadParam($param)
+    {
+        if (isset($param['upload_key'])) {
+            $param['key'] = $param['upload_key'];
+        }
+        if (isset($param['upload_place'])) {
+            $param['place'] = $param['upload_place'];
+        }
+        if (!isset($param['upload_search'])) {
+            $param['upload_search'] = '';
+            $param['upload_search_value'] = $param['project'] . '-' . $param['table'] . '.' . $param['col'];
+        } else {
+            $param['upload_search_value'] = $param['upload_search'];
+        }
+
+        if (isset($param['place']) && $param['place']) {
+            //$pic = 'src="http://placehold.it/' . $param['place'] . '"';
+            $param['place'] = '<img src="http://temp.im/' . $param['place'] . '" class="place" width="150" />';
+        } else {
+            $param['place'] = '';
+        }
+
+        return $param;
+    }
+
     /**
      * image
      *
@@ -248,32 +273,35 @@ class Input
      */
     public static function _image($param)
     {
+        $param = self::uploadParam($param);
         if (isset($param['value']) && $param['value']) {
             $pic = 'src="' . $param['value'] . '"';
             if (strstr($param['value'], '.cr')) {
                 $temp = explode('.cr', $param['value']);
                 $pic .= ' data-src="' . $temp[0] . '"';
             }
-        } elseif (isset($param['places'])) {
-            $pic = 'src="http://placehold.it/' . $param['place'] . '"';
-        } else {
-            $pic = 'src="" style=display:none;';
         }
+
+        $pic = 'src="" style=display:none;';
+
         $class = 'width:100px;display:inline;';
         if (layadmin()) {
             $class .= 'padding-left:0px;';
         }
         $upload = self::uploadHandle($param);
 
-        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="本地上传"/>' . $upload[2][1];
+        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search_value="'.$param['upload_search_value'].'" value="本地上传"/>' . $upload[2][1];
         return $button .'
 
-        <input type="button" style="'.$class.'" class="form-control upload_show" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_show_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="图库"/>
+        <input type="button" style="'.$class.'" class="form-control upload_show" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_show_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search="'.$param['upload_search'].'" value="图库"/>
         <div style="margin-top:10px;display:none;" class="layui-progress layui-progress-big" id="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-filter="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-showPercent="true">
           <div class="layui-progress-bar" lay-percent="0%"></div>
         </div>
 
         <div style="margin:10px;">
+        
+        '.$param['place'].'
+
         <a href="javascript:;" title="打开图片管理工具" onclick="picManage($(this), \'' . $param['name'] . '_' . $param['index'] . '\', \''.$param['key'].'\', 1, \''.$param['name'] . '_info_value\')"><img ' . $pic . ' class="update_value cropper_img" update_type="src" id="show_' . $param['name'] . '_' . $param['index'] . '" width="150" /></a></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'] : '')) . '">';
     }
@@ -285,7 +313,9 @@ class Input
      */
     public static function _images($param)
     {
-        $pic = '';
+        $param = self::uploadParam($param);
+
+        $pic = $param['place'];
         if (isset($param['value']) && $param['value']) {
             $temp = explode(',', $param['value']);
             foreach ($temp as $k => $v) {
@@ -304,10 +334,10 @@ class Input
 
         $upload = self::uploadHandle($param);
 
-        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' mul="yes" v="' . $param['name'] . '_' . $param['index'] . '"  i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="本地上传"/>' . $upload[2][1];
+        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' mul="yes" v="' . $param['name'] . '_' . $param['index'] . '"  i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search_value="'.$param['upload_search_value'].'" value="本地上传"/>' . $upload[2][1];
         return $button . '
 
-        <input type="button" style="'.$class.'" class="form-control upload_show" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '"  i="' . $param['name'] . '_info_value' . '" id="file_show_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="图库"/>
+        <input type="button" style="'.$class.'" class="form-control upload_show" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '"  i="' . $param['name'] . '_info_value' . '" id="file_show_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search="'.$param['upload_search'].'" value="图库"/>
 
         <div style="margin-top:10px;display:none;" class="layui-progress layui-progress-big" id="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-filter="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-showPercent="true">
           <div class="layui-progress-bar" lay-percent="0%"></div>
@@ -326,6 +356,8 @@ class Input
      */
     public static function _upload($param)
     {
+        $param = self::uploadParam($param);
+
         $class = 'width:100px;display:inline;';
         if (layadmin()) {
             $class .= 'padding-left:0px;';
@@ -333,10 +365,10 @@ class Input
 
         $upload = self::uploadHandle($param);
 
-        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' t="file" v="' . $param['name'] . '_' . $param['index'] . '"  i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="本地上传"/>' . $upload[2][1];
+        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' t="file" v="' . $param['name'] . '_' . $param['index'] . '"  i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search_value="'.$param['upload_search_value'].'" value="本地上传"/>' . $upload[2][1];
         return $button .'
 
-        <input type="button" style="'.$class.'" class="form-control upload_show" t="file" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_show_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="文件库"/>
+        <input type="button" style="'.$class.'" class="form-control upload_show" t="file" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_show_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search="'.$param['upload_search'].'" value="文件库"/>
 
         <div style="margin-top:10px;display:none;" class="layui-progress layui-progress-big" id="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-filter="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-showPercent="true">
           <div class="layui-progress-bar" lay-percent="0%"></div>
@@ -354,6 +386,8 @@ class Input
      */
     public static function _uploads($param)
     {
+        $param = self::uploadParam($param);
+
         $file = '';
         if (isset($param['value']) && $param['value']) {
             $temp = explode(',', $param['value']);
@@ -370,10 +404,10 @@ class Input
 
         $upload = self::uploadHandle($param);
 
-        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' t="file" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="本地上传"/>' . $upload[2][1];
+        $button = $upload[2][0] . '<input type="'.$upload[1].'" style="'.$class.$upload[3].'" class="form-control image_upload" '.$upload[0].' t="file" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search_value="'.$param['upload_search_value'].'" value="本地上传"/>' . $upload[2][1];
         return $button .'
 
-        <input type="button" style="'.$class.'" class="form-control upload_show" t="file" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" value="文件库"/>
+        <input type="button" style="'.$class.'" class="form-control upload_show" t="file" mul="yes" v="' . $param['name'] . '_' . $param['index'] . '" i="' . $param['name'] . '_info_value' . '" id="file_' . $param['name'] . '_' . $param['index'] . '" key="' . $param['key'] . '" upload_search="'.$param['upload_search'].'" value="文件库"/>
 
         <div style="margin-top:10px;display:none;" class="layui-progress layui-progress-big" id="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-filter="file_' . $param['name'] . '_' . $param['index'] . '_progress" lay-showPercent="true">
           <div class="layui-progress-bar" lay-percent="0%"></div>