ver. 0.2.35

uxcore · Mar 12, 2018 · 4a60bec · 4a60bec
1 parent 0f0293b
commit 4a60bec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 # history
 
+## 0.2.24 / 2018-03-12
+
+* `CHANGED` change grid percent to match the expected behaviour
+
 ## 0.2.33 / 2018-01-03
 
 * `NEW` support new prop `gridLayout`

diff --git a/demo/FormFieldDemo.jsx b/demo/FormFieldDemo.jsx
@@ -49,7 +49,7 @@ class Demo extends React.Component {
             jsxlabel="字很多字很多字很多字很多字"
             placeholder="111"
             jsxtips="提示"
-            // gridLayout={[8, 14]}
+            gridLayout={[6, 12]}
             labelMatchInputHeight={false}
             // verticalAlign
           />

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "uxcore-form-field",
- "version": "0.2.34",
+ "version": "0.2.35",
  "description": "uxcore-form-field component for uxcore.",
  "repository": "https://github.com/uxcore/uxcore-form-field.git",
  "author": "eternalsky",

diff --git a/src/FormField.jsx b/src/FormField.jsx
@@ -48,7 +48,7 @@ class FormField extends React.Component {
     const me = this;
     const gridLayout = me.props.gridLayout || me.props.jsxGridLayout;
     const newGrid = [gridLayout[0] || 6, gridLayout[1] || 12];
-    return `${(newGrid[index] * 100) / 24}%`;
+    return `${(newGrid[index] * 100) / (24 - (index === 1 ? newGrid[0] : 0))}%`;
   }
 
   getSize() {