diff --git a/package.json b/package.json index 65126997..596e8028 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.3.2", + "version": "0.3.3", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/" diff --git a/src/components/Button/SButton.vue b/src/components/Button/SButton.vue index f8763a34..ce9ee5ff 100644 --- a/src/components/Button/SButton.vue +++ b/src/components/Button/SButton.vue @@ -1,5 +1,5 @@ @@ -47,10 +47,12 @@ import { ElDropdown } from 'element-ui/types/dropdown' import { DropdownType, DropdownSize, DropdownPlacement, DropdownTrigger } from './consts' import { ButtonTypes, SButton } from '../Button' +import { STooltip } from '../Tooltip' @Component({ components: { - SButton + SButton, + STooltip } }) export default class SDropdown extends Vue { diff --git a/src/components/Form/SFormItem.vue b/src/components/Form/SFormItem.vue index 7fc292a5..1c7f347c 100644 --- a/src/components/Form/SFormItem.vue +++ b/src/components/Form/SFormItem.vue @@ -13,7 +13,7 @@ > - + @@ -89,6 +89,10 @@ export default class SFormItem extends Vue { }) } + get willMessageBeShown (): boolean { + return this.showMessage && (this.elForm || {}).showMessage + } + get computedRules (): object { const rules = (this.rules || (this.elForm.rules || {})[this.prop]) as any if (!rules) { diff --git a/src/components/Radio/SRadio.vue b/src/components/Radio/SRadio.vue new file mode 100644 index 00000000..19ded97c --- /dev/null +++ b/src/components/Radio/SRadio.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/components/Radio/consts.ts b/src/components/Radio/consts.ts new file mode 100644 index 00000000..63f35931 --- /dev/null +++ b/src/components/Radio/consts.ts @@ -0,0 +1,3 @@ +import { Size } from '../../types' + +export const RadioSize = Size diff --git a/src/components/Radio/index.ts b/src/components/Radio/index.ts new file mode 100644 index 00000000..ec804fcd --- /dev/null +++ b/src/components/Radio/index.ts @@ -0,0 +1,4 @@ +import SRadio from './SRadio.vue' +import { RadioSize } from './consts' + +export { SRadio, RadioSize } diff --git a/src/components/Tooltip/STooltip.vue b/src/components/Tooltip/STooltip.vue index 4b65cc01..1cd77a70 100644 --- a/src/components/Tooltip/STooltip.vue +++ b/src/components/Tooltip/STooltip.vue @@ -1,5 +1,6 @@