From fde93f16b38723e02e399695360e83b23de4b7c6 Mon Sep 17 00:00:00 2001
From: "MOONTING-2\\nullice" <ui@nullice.com>
Date: Wed, 26 Apr 2017 22:55:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E2=80=9CUI-DNA=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=20-=20=E5=BD=A2=E7=8A=B6=20-=20=E5=BD=A2?=
 =?UTF-8?q?=E7=8A=B6=E4=BD=8D=E7=BD=AE=E2=80=9D=20=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=9B=BE=E5=B1=82=E6=97=B6=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=88=86=E5=88=AB=E5=AF=B9=E6=AF=8F=E4=B8=AA=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E5=8D=95=E7=8B=AC=E8=AE=BE=E7=BD=AE=E3=80=82=20fix=20?=
 =?UTF-8?q?=E2=80=9CUI-DNA=20=E5=B1=9E=E6=80=A7=E2=80=9D=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=9C=A8=E6=B2=A1=E6=9C=89=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DVE/.idea/workspace.xml                      |  4 +--
 DVE/components/AttributePanel.vue            | 31 ++++++++++++--------
 DVE/components/AttributePanel_valueInput.vue |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/DVE/.idea/workspace.xml b/DVE/.idea/workspace.xml
index d1b186a..e4f011c 100644
--- a/DVE/.idea/workspace.xml
+++ b/DVE/.idea/workspace.xml
@@ -992,12 +992,12 @@
       <workItem from="1493048734883" duration="618000" />
       <workItem from="1493088877271" duration="5341000" />
       <workItem from="1493117095583" duration="27818000" />
-      <workItem from="1493185153167" duration="14416000" />
+      <workItem from="1493185153167" duration="14859000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3309375000" />
+    <option name="totallyTimeSpent" value="3309818000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
diff --git a/DVE/components/AttributePanel.vue b/DVE/components/AttributePanel.vue
index 5fd75c8..ad9a0d2 100644
--- a/DVE/components/AttributePanel.vue
+++ b/DVE/components/AttributePanel.vue
@@ -224,6 +224,17 @@
                     <div class="exmo_box_name">圆角弧度</div>
                 </div>
                 <div>
+
+                    <value-input v-bind:name="Lang.from('左上')"
+                                 v-bind:title="Lang.from('左上')"
+                                 v-bind:edit_value.sync="Gob.shape.radian.topLeft"
+                                 v-bind:out_value.sync="Gob.shape.assignment.radian.topLeft"
+                                 v-bind:enable_assign.sync="Gob.shape.enableAssigns.radian.topLeft"
+                                 v-bind:assist_type="'radian'"
+                                 v-bind:assist_range_max="100"
+                                 mini="true"></value-input>
+
+
                     <value-input v-bind:name="Lang.from('右上')"
                                  v-bind:title="Lang.from('右上')"
                                  v-bind:edit_value.sync="Gob.shape.radian.topRight"
@@ -234,11 +245,12 @@
 
                                  mini="true"></value-input>
 
-                    <value-input v-bind:name="Lang.from('左上')"
-                                 v-bind:title="Lang.from('左上')"
-                                 v-bind:edit_value.sync="Gob.shape.radian.topLeft"
-                                 v-bind:out_value.sync="Gob.shape.assignment.radian.topLeft"
-                                 v-bind:enable_assign.sync="Gob.shape.enableAssigns.radian.topLeft"
+
+                    <value-input v-bind:name="Lang.from('左下')"
+                                 v-bind:title="Lang.from('左下')"
+                                 v-bind:edit_value.sync="Gob.shape.radian.bottomLeft"
+                                 v-bind:out_value.sync="Gob.shape.assignment.radian.bottomLeft"
+                                 v-bind:enable_assign.sync="Gob.shape.enableAssigns.radian.bottomLeft"
                                  v-bind:assist_type="'radian'"
                                  v-bind:assist_range_max="100"
                                  mini="true"></value-input>
@@ -252,14 +264,7 @@
                                  v-bind:assist_range_max="100"
                                  mini="true"></value-input>
 
-                    <value-input v-bind:name="Lang.from('左下')"
-                                 v-bind:title="Lang.from('左下')"
-                                 v-bind:edit_value.sync="Gob.shape.radian.bottomLeft"
-                                 v-bind:out_value.sync="Gob.shape.assignment.radian.bottomLeft"
-                                 v-bind:enable_assign.sync="Gob.shape.enableAssigns.radian.bottomLeft"
-                                 v-bind:assist_type="'radian'"
-                                 v-bind:assist_range_max="100"
-                                 mini="true"></value-input>
+
                 </div>
 
                 <div>
diff --git a/DVE/components/AttributePanel_valueInput.vue b/DVE/components/AttributePanel_valueInput.vue
index a1335f9..8707de6 100644
--- a/DVE/components/AttributePanel_valueInput.vue
+++ b/DVE/components/AttributePanel_valueInput.vue
@@ -12,7 +12,7 @@
         <input type="text" class="exmo_input_text edit_input "
                v-bind:type="readonly?'readonly':'text'"
                v-model:value="o_edit"
-           
+
                v-bind:placeholder="o_edit_placeholder"
                v-bind:class="{'uppercase':o_uppercase}"
                @focus.stop="on_foucs"