Merge pull request #10 from jimengio/antd4

upgrading antd4
jimengio · Sep 9, 2020 · 57ed138 · 57ed138
2 parents ce51fcd + eb5fab9
commit 57ed138
Show file tree

Hide file tree

Showing 6 changed files with 1,206 additions and 1,408 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jimengio/code-rule-editor",
-  "version": "0.1.2",
+  "version": "0.1.3-a1",
   "description": "Code rule editor of JimengIO",
   "main": "lib/index.js",
   "scripts": {
@@ -21,50 +21,50 @@
   "license": "MIT",
   "devDependencies": {
     "@jimengio/ci-progress-webpack-plugin": "^0.1.0",
-    "@jimengio/doc-frame": "^0.1.11",
-    "@jimengio/flex-styles": "^0.1.6",
-    "@jimengio/jimo-basics": "^0.0.13-a1",
-    "@jimengio/jimo-icons": "^0.3.4",
-    "@jimengio/meson-modal": "^0.3.3",
-    "@jimengio/router-code-generator": "^0.2.6-a1",
-    "@jimengio/ruled-router": "^0.2.24-a5",
+    "@jimengio/doc-frame": "^0.1.13",
+    "@jimengio/flex-styles": "^0.2.0",
+    "@jimengio/jimo-basics": "^0.1.11",
+    "@jimengio/jimo-icons": "^0.3.14",
+    "@jimengio/meson-modal": "^0.3.10",
+    "@jimengio/router-code-generator": "^0.3.0",
+    "@jimengio/ruled-router": "^0.2.27",
     "@jimengio/safe-property": "^0.0.2",
     "@types/lodash-es": "^4.17.3",
-    "@types/node": "^13.7.1",
-    "@types/prettier": "^1.19.0",
-    "@types/react": "^16.9.19",
+    "@types/node": "^14.6.4",
+    "@types/prettier": "^2.1.0",
+    "@types/react": "^16.9.49",
     "@types/react-dom": "^16.9.5",
-    "antd": "^3.26.11",
+    "antd": "^4.6.3",
     "cache-loader": "^4.1.0",
-    "css-loader": "^3.4.2",
+    "css-loader": "^4.2.2",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
-    "file-loader": "^5.0.2",
-    "fork-ts-checker-webpack-plugin": "^4.0.4",
-    "html-webpack-plugin": "^3.2.0",
+    "file-loader": "^6.1.0",
+    "fork-ts-checker-webpack-plugin": "^5.1.0",
+    "html-webpack-plugin": "^4.4.1",
     "html-webpack-tags-plugin": "^2.0.17",
     "http-server": "^0.12.1",
-    "mini-css-extract-plugin": "^0.9.0",
-    "prettier": "^1.19.1",
+    "mini-css-extract-plugin": "^0.11.0",
+    "prettier": "^2.1.1",
     "style-loader": "^1.1.3",
     "thread-loader": "^2.1.3",
-    "ts-loader": "^6.2.1",
-    "ts-node": "^8.6.2",
+    "ts-loader": "^8.0.3",
+    "ts-node": "^9.0.0",
     "tsconfig-paths": "^3.9.0",
-    "tsconfig-paths-webpack-plugin": "^3.2.0",
-    "typescript": "^3.7.5",
+    "tsconfig-paths-webpack-plugin": "^3.3.0",
+    "typescript": "^4.0.2",
     "typescript-styled-plugin": "^0.15.0",
-    "url-loader": "^3.0.0",
-    "webpack": "^4.41.6",
+    "url-loader": "^4.1.0",
+    "webpack": "^4.44.1",
     "webpack-bundle-analyzer": "^3.6.0",
     "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.10.3",
     "webpack-hud": "^0.1.2"
   },
   "dependencies": {
-    "dayjs": "^1.8.20",
+    "dayjs": "^1.8.35",
     "decimal.js": "^10.2.0",
     "emotion": "^10.0.27",
-    "immer": "^5.3.6",
+    "immer": "^7.0.8",
     "lodash-es": "^4.17.15",
     "query-string": "^6.11.0",
     "react": "^16.12.0",

diff --git a/src/code-rule-view.tsx b/src/code-rule-view.tsx
@@ -4,7 +4,7 @@ import produce from "immer";
 
 import { ECodeRuleType } from "./models/types";
 import { ICodeRule, ICodeRuleFormUserInput } from "./models/code-rule";
-import { column, row, rowMiddle, flex } from "@jimengio/flex-styles";
+import { column, row, rowMiddle, expand } from "@jimengio/flex-styles";
 import { lang, formatString } from "./lingual";
 import { getCodeContent, renderUserInput, parseCodeRuleMap } from "./utils/sequence-rule";
 import InputFormItem from "./forms/input-form-item";
@@ -32,7 +32,7 @@ export default class CodeRuleView extends Component<IProps, any> {
       mainContainer = column;
       itemContainer = cx(rowMiddle, marginBottom16);
       labelContainer = styleLabel;
-      valueContainer = flex;
+      valueContainer = expand;
     }
 
     return (

diff --git a/src/forms/input-form-item.tsx b/src/forms/input-form-item.tsx
@@ -14,7 +14,7 @@ interface IProps {
   suffix?: string | React.ReactNode;
   type?: string;
   disabled?: boolean;
-  size?: "large" | "default" | "small";
+  size?: "large" | "middle" | "small";
   onChange?: (value: string) => void;
   onFocus?: () => void;
   onBlur?: () => void;

diff --git a/src/immer-form.tsx b/src/immer-form.tsx
@@ -6,7 +6,7 @@ import * as React from "react";
 import { CSSProperties, ReactNode } from "react";
 import { isString, values, isNil, isObject } from "lodash-es";
 import { css, cx } from "emotion";
-import { inlineRow, column, row, flex } from "@jimengio/flex-styles";
+import { inlineRow, column, row, expand } from "@jimengio/flex-styles";
 import { lang, formatString } from "./lingual";
 import Input from "antd/lib/input";
 import Alert from "antd/lib/alert";
@@ -178,7 +178,7 @@ export class LabeledField extends React.Component<IFieldOptions, any> {
             {!this.props.hideSymbolColon && <span>{options.label !== null ? lang.symbolColon : null}</span>}
           </div>
         )}
-        <div className={cx(flex, styleFormValueContainer)}>
+        <div className={cx(expand, styleFormValueContainer)}>
           {valueItem}
           {options.validationFailure ? renderFailure(options.validationFailure) : null}
         </div>

diff --git a/src/types-dropdown.tsx b/src/types-dropdown.tsx
@@ -53,7 +53,11 @@ export default class CodeRuleTypesEditor extends React.Component<IProps, IState>
         {ruleTypes
           .filter((type) => !(excludeTypes || []).includes(type))
           .map((type) => {
-            return <Option key={type}>{lang[`sequence_${type}`]}</Option>;
+            return (
+              <Option value={type} key={type}>
+                {lang[`sequence_${type}`]}
+              </Option>
+            );
           })}
       </Select>
     );