@qn-pandora/pandora-component 3.0.0 → 3.1.0

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export * from '@qn-pandora/pandora-component-icons';
 export { SDK_PREFIX } from './constants/style';
 export { default as Button, IButtonProps } from './components/Button';
 export { default as Card } from './components/Card';
-export { default as Collapse } from './components/Collapse';
+export { default as Collapse, ECollapseType } from './components/Collapse';
 export { default as ConfigProvider } from './components/ConfigProvider';
 export { default as NameLimiter, INameLimiterProps } from './components/NameLimiter';
 export { default as Input, TInputProps } from './components/Input';
@@ -14,6 +14,7 @@ export * from './components/DateTimePicker/constants';
 export * from './components/DateTimePicker/transform';
 export { default as Style } from './components/Style';
 export { default as SolidRadioGroup, ISolidRadioGroupProps, IOption as ISolidRadioGroupOption } from './components/SolidRadioGroup';
+export { default as RadioGroup } from './components/RadioGroup';
 export { default as Menu, IOption as IMenuOption } from './components/Menu';
 export { default as Spin, SpinMode } from './components/Spin';
 export { default as Modal } from './components/Modal';

package/lib/index.js

@@ -12,6 +12,7 @@ var Card_1 = require("./components/Card");
 exports.Card = Card_1.default;
 var Collapse_1 = require("./components/Collapse");
 exports.Collapse = Collapse_1.default;
+exports.ECollapseType = Collapse_1.ECollapseType;
 var ConfigProvider_1 = require("./components/ConfigProvider");
 exports.ConfigProvider = ConfigProvider_1.default;
 var NameLimiter_1 = require("./components/NameLimiter");
@@ -34,6 +35,8 @@ var Style_1 = require("./components/Style");
 exports.Style = Style_1.default;
 var SolidRadioGroup_1 = require("./components/SolidRadioGroup");
 exports.SolidRadioGroup = SolidRadioGroup_1.default;
+var RadioGroup_1 = require("./components/RadioGroup");
+exports.RadioGroup = RadioGroup_1.default;
 var Menu_1 = require("./components/Menu");
 exports.Menu = Menu_1.default;
 var Spin_1 = require("./components/Spin");

package/lib/index.less

@@ -2,12 +2,13 @@
 @import './style/theme.less';
 @import './components/AutoComplete/style.less';
 @import './components/Breadcrumb/style.less';
-@import './components/Button/style.less';
 @import './components/Card/style.less';
+@import './components/Button/style.less';
 @import './components/CheckTransformList/style.less';
 @import './components/Checkbox/style.less';
 @import './components/CheckboxList/style.less';
 @import './components/CollapsiblePanel/style.less';
+@import './components/Collapse/style.less';
 @import './components/DateTimePicker/style.less';
 @import './components/Drawer/style.less';
 @import './components/Input/style.less';
@@ -18,10 +19,10 @@
 @import './components/NameExplainTooltip/style.less';
 @import './components/NameLimiter/style.less';
 @import './components/OptionList/style.less';
+@import './components/RadioGroup/style.less';
 @import './components/RangeInput/style.less';
-@import './components/RemarkName/style.less';
 @import './components/Selector/style.less';
-@import './components/SolidRadioGroup/style.less';
+@import './components/RemarkName/style.less';
 @import './components/Spin/style.less';
 @import './components/Steps/style.less';
 @import './components/Table/style.less';
@@ -32,8 +33,6 @@
 @import './components/TreeSelector/style.less';
 @import './components/Card/RowExtra/style.less';
 @import './components/Card/SearchInput/style.less';
-@import './components/Collapse/Panel/style.less';
-@import './components/Collapse/stories/style.stories.less';
 @import './components/DateTimePicker/Base/style.less';
 @import './components/DateTimePicker/BaseMobile/style.less';
 @import './components/DateTimePicker/DisplayInput/style.less';
@@ -47,4 +46,5 @@
 @import './components/Timeline/TimelineItem/style.less';
 @import './components/Transfer/List/style.less';
 @import './components/Transfer/ListBody/style.less';
-@import './components/DateTimePicker/BaseMobile/Absolute/style.less';
+@import './components/DateTimePicker/BaseMobile/Absolute/style.less';
+@import './components/DateTimePicker/Collapse/Panel/style.less';

package/lib/style/theme.less

@@ -123,8 +123,8 @@
 @zindex-popover: 1200; // antd
 @zindex-tooltip: 1300; // antd
 // pandora色
-@zindex-layout-navbar: 1210; // phoenix
-@zindex-layout-sidebar: 1200; // phoenix
+@zindex-layout-navbar: 1100; // phoenix
+@zindex-layout-sidebar: 1000; // phoenix
 @zindex-toaster: 3000; // app-platform phoenix
 
 // 组件色变量=========================================================
@@ -370,3 +370,10 @@
 }
 
 @icon-hover-color: rgba(19, 107, 255, 0.1);
+
+// radio--------------
+// antd覆盖色
+@radio-dot-color: @theme-color;
+@radio-button-color: @heading-color;
+@radio-button-active-color: @theme-color;
+@radio-button-hover-color: @theme-color;

package/lib/utils/language.d.ts

@@ -0,0 +1 @@
+export declare function formatString(path: any, locale?: import("antd/es/locale-provider").Locale): any;

package/lib/utils/language.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var lodash_1 = require("lodash");
+var zh_CN_1 = __importDefault(require("antd/es/locale-provider/zh_CN"));
+var zh_1 = require("../constants/language/zh");
+var en_1 = require("../constants/language/en");
+function formatString(path, locale) {
+    if (locale === void 0) { locale = zh_CN_1.default; }
+    if (lodash_1.isString(path)) {
+        var message = lodash_1.get(locale === zh_CN_1.default ? zh_1.component_zh : en_1.component_en, path);
+        if (message && lodash_1.isString(message)) {
+            return message;
+        }
+        return path;
+    }
+    return path;
+}
+exports.formatString = formatString;

package/lib/utils/languageLocale.d.ts

@@ -0,0 +1 @@
+export declare function languageLocale<T>(prefix: string, obj: T): T;

package/lib/utils/languageLocale.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var flat_1 = require("flat");
+function languageLocale(prefix, obj) {
+    var flattenObj = flat_1.flatten(obj);
+    var result = {};
+    Object.keys(flattenObj).map(function (key) {
+        result[key] = "" + prefix + key;
+    });
+    return flat_1.unflatten(result);
+}
+exports.languageLocale = languageLocale;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qn-pandora/pandora-component",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "基础组件",
   "author": "pandora <pandora@qiniu.com>",
   "homepage": "https://github.com/qbox/phoenix#readme",
@@ -39,7 +39,7 @@
     "url": "https://github.com/qbox/phoenix/issues"
   },
   "peerDependencies": {
-    "antd": "4.16.3",
+    "antd": "4.16.9",
     "lodash": "^4.17.15",
     "mobx": "^4.15.4",
     "mobx-react": "5.4.4",
@@ -48,20 +48,21 @@
   "devDependencies": {
     "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
     "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@qn-pandora/pandora-tools": "^1.0.0",
+    "@qn-pandora/pandora-tools": "^1.1.0",
     "@svgr/webpack": "^5.4.0",
     "@types/classnames": "^2.2.7",
-    "@types/react": "^16.14.5",
-    "@types/react-measure": "^2.0.4",
-    "@types/prop-types": "^15.7.1",
     "@types/css": "^0.0.31",
+    "@types/flat": "^5.0.2",
     "@types/jest": "^25.2.3",
     "@types/lodash": "^4.14.152",
     "@types/node": "^14.0.12",
+    "@types/prop-types": "^15.7.1",
+    "@types/react": "^16.14.5",
+    "@types/react-measure": "^2.0.4",
     "@typescript-eslint/eslint-plugin": "^4.1.0",
     "@typescript-eslint/eslint-plugin-tslint": "^4.1.0",
     "@typescript-eslint/parser": "^4.1.0",
-    "antd": "4.16.3",
+    "antd": "4.16.9",
     "antd-mobile": "^2.3.3",
     "babel-loader": "^8.1.0",
     "copy-webpack-plugin": "^5.1.1",
@@ -70,6 +71,7 @@
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-hooks": "^4.1.0",
     "file-loader": "^6.1.0",
+    "flat": "^5.0.2",
     "jest": "^26.0.1",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
@@ -94,10 +96,11 @@
   "dependencies": {
     "@ant-design/compatible": "1.0.8",
     "@ant-design/icons": "4.6.2",
-    "@qn-pandora/pandora-component-icons": "^2.0.0",
+    "@qn-pandora/pandora-component-icons": "^2.1.0",
+    "flat": "^5.0.2",
     "antd-mobile": "2.3.3",
-    "css": "^2.2.4",
     "classnames": "^2.2.6",
+    "css": "^2.2.4",
     "moment": "^2.29.1",
     "prop-types": "^15.7.2",
     "react-measure": "^2.5.2"

package/es/components/Collapse/stories/style.stories.css

@@ -1,12 +0,0 @@
-.ant-btn {
-  padding: 4px 15px;
-}
-.ant-btn-sm {
-  padding: 0 7px;
-}
-.pandora-sdk-custom-panel-title {
-  color: red;
-}
-.pandora-sdk-custom-panel-content {
-  color: red;
-}

package/es/components/Collapse/stories/style.stories.less

@@ -1,7 +0,0 @@
-@import '../../../style/theme.less';
-.@{sdk-prefix}-custom-panel-title {
-  color: red;
-}
-.@{sdk-prefix}-custom-panel-content {
-  color: red;
-}

package/es/components/SolidRadioGroup/style.less

@@ -1,39 +0,0 @@
-@import 'antd/lib/radio/style/index.less';
-@import '../../style/theme.less';
-
-.@{sdk-prefix}-solid-radio-group {
-  .@{sdk-prefix}-solid-radio-item {
-    padding: 0 12px;
-    border-color: @input-border-color !important;
-    color: @heading-color;
-    text-align: center;
-    &:hover {
-      background: @table-thead-bg;
-      border-color: @input-border-color;
-    }
-  }
-  .@{ant-prefix}-radio-button-wrapper-checked,
-  .@{ant-prefix}-radio-button-wrapper-checked:hover {
-    border-color: @theme-color !important;
-    color: @theme-color !important;
-  }
-
-  .@{ant-prefix}-radio-button-wrapper-checked.@{ant-prefix}-radio-button-wrapper-disabled {
-    border-color: @input-border-color !important;
-    color: @heading-color!important;
-  }
-
-  .@{ant-prefix}-radio-button-wrapper {
-    &:not(:first-child) {
-      &::before {
-        background-color: @input-border-color;
-      }
-    }
-  }
-}
-
-.@{ant-prefix}-radio-button-wrapper-checked {
-  &:not(.@{ant-prefix}-radio-button-wrapper-disabled)::before {
-    background-color: @theme-color !important;
-  }
-}

package/lib/components/Collapse/stories/style.stories.css

@@ -1,12 +0,0 @@
-.ant-btn {
-  padding: 4px 15px;
-}
-.ant-btn-sm {
-  padding: 0 7px;
-}
-.pandora-sdk-custom-panel-title {
-  color: red;
-}
-.pandora-sdk-custom-panel-content {
-  color: red;
-}

package/lib/components/Collapse/stories/style.stories.less

@@ -1,7 +0,0 @@
-@import '../../../style/theme.less';
-.@{sdk-prefix}-custom-panel-title {
-  color: red;
-}
-.@{sdk-prefix}-custom-panel-content {
-  color: red;
-}

package/lib/components/SolidRadioGroup/style.less

@@ -1,39 +0,0 @@
-@import 'antd/lib/radio/style/index.less';
-@import '../../style/theme.less';
-
-.@{sdk-prefix}-solid-radio-group {
-  .@{sdk-prefix}-solid-radio-item {
-    padding: 0 12px;
-    border-color: @input-border-color !important;
-    color: @heading-color;
-    text-align: center;
-    &:hover {
-      background: @table-thead-bg;
-      border-color: @input-border-color;
-    }
-  }
-  .@{ant-prefix}-radio-button-wrapper-checked,
-  .@{ant-prefix}-radio-button-wrapper-checked:hover {
-    border-color: @theme-color !important;
-    color: @theme-color !important;
-  }
-
-  .@{ant-prefix}-radio-button-wrapper-checked.@{ant-prefix}-radio-button-wrapper-disabled {
-    border-color: @input-border-color !important;
-    color: @heading-color!important;
-  }
-
-  .@{ant-prefix}-radio-button-wrapper {
-    &:not(:first-child) {
-      &::before {
-        background-color: @input-border-color;
-      }
-    }
-  }
-}
-
-.@{ant-prefix}-radio-button-wrapper-checked {
-  &:not(.@{ant-prefix}-radio-button-wrapper-disabled)::before {
-    background-color: @theme-color !important;
-  }
-}