rabin před 5 roky
rodič
revize
df29def2a2
2 změnil soubory, kde provedl 60 přidání a 4 odebrání
  1. 42 4
      assets/html/manage.html
  2. 18 0
      src/View.php

+ 42 - 4
assets/html/manage.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="<{Dever::assets('lib/bootstrap/css/bootstrap.min.css', 'script')}>">
   <link rel="stylesheet" href="<{Dever::assets('lib/cropper/cropper.min.css', 'script')}>">
   <link rel="stylesheet" href="<{Dever::assets('lib/cropper/main.css', 'script')}>">
-  <script><{Dever::script()}></script>
+  <script><{Dever::script()}>;var aspectRatioValue = '<{$ratio}>'</script>
 </head>
 <body>
   <!-- Content -->
@@ -32,7 +32,40 @@
         </div>
 
         <!-- <h3>Data:</h3> -->
-        <div class="docs-data" style="display: none;">
+        <div class="docs-data" style="position: absolute;left:160px">
+          <table border="1">
+            <tr>
+              <td width="30%">X</td>
+              <td width="60%"><span id="dataX_text"></span></td>
+            </tr>
+            <tr>
+              <td>Y</td>
+              <td><span id="dataY_text"></span></td>
+            </tr>
+            <tr>
+              <td>W</td>
+              <td><span id="dataWidth_text"></span></td>
+            </tr>
+            <tr>
+              <td>H</td>
+              <td><span id="dataHeight_text"></span></td>
+            </tr>
+            
+            <tr>
+              <td>R</td>
+              <td><span id="dataRotate_text"></span></td>
+            </tr>
+            <tr>
+              <td>SX</td>
+              <td><span id="dataScaleX_text"></span></td>
+            </tr>
+            <tr>
+              <td>SY</td>
+              <td><span id="dataScaleY_text"></span></td>
+            </tr>
+          </table>
+        </div>
+        <div class="docs-data" style="display: none;position: absolute;left:150px">
           <div class="input-group input-group-sm">
             <span class="input-group-prepend">
               <label class="input-group-text" for="dataX">X</label>
@@ -237,6 +270,11 @@
               1:1
             </span>
           </button>
+          <button type="button" class="btn btn-primary" data-method="aspectRatio" title="Reset" data-value="<{$ratio}>">
+            <span class="docs-tooltip" data-toggle="tooltip" title="<{$wh}>">
+              当前
+            </span>
+          </button>
           <button type="button" class="btn btn-primary" data-method="aspectRatio" title="Reset" data-value="NAN">
             <span class="docs-tooltip" data-toggle="tooltip" title="自定义">
               自定义
@@ -246,12 +284,12 @@
 
         <div class="btn-group">
           <button type="button" class="btn btn-primary" data-method="save" title="save">
-            <span class="docs-tooltip" data-toggle="tooltip" title="16:9">
+            <span class="docs-tooltip" data-toggle="tooltip" title="保存">
              	保存
             </span>
           </button>
           <button type="button" class="btn btn-primary" data-method="del" title="del">
-            <span class="docs-tooltip" data-toggle="tooltip" title="16:9">
+            <span class="docs-tooltip" data-toggle="tooltip" title="删除">
              	删除
             </span>
           </button>

+ 18 - 0
src/View.php

@@ -33,6 +33,17 @@ class View
         $data['key'] = Dever::input('key');
         $data['state'] = Dever::input('state');
         $data['pic'] = Dever::input('pic');
+        $data['wh'] = Dever::input('wh');
+        $data['ratio'] = 16 / 9;
+        if ($data['wh']) {
+            if (strstr($data['wh'], '*')) {
+                $data['ratio'] = $this->ratio('*', $data['wh']);
+            } elseif (strstr($data['wh'], 'x')) {
+                $data['ratio'] = $this->ratio('x', $data['wh']);
+            } elseif (strstr($data['wh'], 'X')) {
+                $data['ratio'] = $this->ratio('X', $data['wh']);
+            }
+        }
         $data['search_cate'] = 1;
         $data['cate'] = Dever::db('upload/cate')->state();
         $data['param'] = '';
@@ -49,6 +60,13 @@ class View
         $data = Dever::render('manage', $data);
         Dever::out($data);
     }
+
+    private function ratio($str, $wh)
+    {
+        $temp = explode($str, $wh);
+        $ratio = $temp[0] / $temp[1];
+        return $ratio;
+    }
     
     public function files($view)
     {