瀏覽代碼

table-cel 样式应用bug

zhuth 6 年之前
父節點
當前提交
6fd61127be
共有 3 個文件被更改,包括 12 次插入7 次删除
  1. 4 2
      kanban-client/app/component/converter.js
  2. 5 4
      kanban-client/app/src/Table/TableCell.jsx
  3. 3 1
      kanban-client/package.json

+ 4 - 2
kanban-client/app/component/converter.js

@@ -83,7 +83,7 @@ function tableConfig(model, theme) {
     if(title) {
     if(title) {
         title.style = parseObjectStr(title.style || '{}');
         title.style = parseObjectStr(title.style || '{}');
     }
     }
-    return {
+    let c = {
         type: 'table',
         type: 'table',
         config: {
         config: {
             fontSize: fontSize || getFontSize(),
             fontSize: fontSize || getFontSize(),
@@ -109,7 +109,9 @@ function tableConfig(model, theme) {
             rowsStyle: parseObjectStr(rowsstyle),
             rowsStyle: parseObjectStr(rowsstyle),
         },
         },
         layout: getLayout(layout)
         layout: getLayout(layout)
-    }
+    };
+    
+    return c;
 }
 }
 
 
 function barConfig(model, theme) {
 function barConfig(model, theme) {

+ 5 - 4
kanban-client/app/src/Table/TableCell.jsx

@@ -74,12 +74,13 @@ export default class TableCell extends React.Component {
       <td
       <td
         className={className}
         className={className}
         onClick={this.handleClick}
         onClick={this.handleClick}
-        style={rowStyle}
         {...tdProps}
         {...tdProps}
       >
       >
-        {indentText}
-        {expandIcon}
-        {text}
+        <div style={rowStyle}>
+          {indentText}
+          {expandIcon}
+          {text}
+        </div>
       </td>
       </td>
     );
     );
   }
   }

+ 3 - 1
kanban-client/package.json

@@ -4,7 +4,8 @@
   "description": "boardshow",
   "description": "boardshow",
   "main": "main.js",
   "main": "main.js",
   "scripts": {
   "scripts": {
-    "start": "webpack-dev-server --port 8100 --inline --content-base build/ --config webpack.dev.config"
+    "start": "webpack-dev-server --port 8100 --inline --content-base build/ --config webpack.dev.config",
+    "build": "webpack"
   },
   },
   "keywords": [
   "keywords": [
     "board",
     "board",
@@ -19,6 +20,7 @@
     "element-resize-event": "^2.0.9",
     "element-resize-event": "^2.0.9",
     "jquery": "^1.11.2",
     "jquery": "^1.11.2",
     "lodash.get": "^4.4.2",
     "lodash.get": "^4.4.2",
+    "promise-polyfill": "^7.1.2",
     "prop-types": "^15.5.8",
     "prop-types": "^15.5.8",
     "rc-animate": "^2.3.0",
     "rc-animate": "^2.3.0",
     "rc-util": "4.x",
     "rc-util": "4.x",