diff --git a/plop/store-template/index.hbs b/plop/store-template/index.hbs index 702352da..5722a89d 100644 --- a/plop/store-template/index.hbs +++ b/plop/store-template/index.hbs @@ -5,7 +5,7 @@ import { StorageEnum } from '@/enums/storageEnum' export const use{{upperDataName}}Store = defineStore({ id: 'use{{upperDataName}}Store', - state: (): {{name}}StoreType => ({}), + state: (): {{upperDataName}}StoreType => ({}), getters: {}, actions: {} }) \ No newline at end of file diff --git a/plop/store-template/prompt.js b/plop/store-template/prompt.js index 180cbd26..4fab8a88 100644 --- a/plop/store-template/prompt.js +++ b/plop/store-template/prompt.js @@ -22,7 +22,7 @@ module.exports = { const actions = [ { type: 'add', - path: `${process.cwd()}/src/store/modules/${dataName}Store/${dataName}Store}.ts`, // 这里的name就是上面定义的键 + path: `${process.cwd()}/src/store/modules/${dataName}Store/${dataName}Store.ts`, // 这里的name就是上面定义的键 templateFile: './store-template/index.hbs', data: { name: data.name, @@ -32,7 +32,11 @@ module.exports = { { type: 'add', path: `${process.cwd()}/src/store/modules/${dataName}Store/${dataName}Store.d.ts`, // 这里的name就是上面定义的键 - templateFile: './store-template/index.d.hbs' + templateFile: './store-template/index.d.hbs', + data: { + name: data.name, + upperDataName, + } }, ] diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts index 70c76bec..140a3add 100644 --- a/src/i18n/en/index.ts +++ b/src/i18n/en/index.ts @@ -17,7 +17,7 @@ const global = { // right key r_edit: 'Edit', r_preview: 'Preview', - r_copy: 'Copy', + r_copy: 'Clone', r_rename: 'Rename', r_publish: 'Publish', r_unpublish: 'Unpublish', diff --git a/src/i18n/zh/index.ts b/src/i18n/zh/index.ts index e96409b0..0fd4dd05 100644 --- a/src/i18n/zh/index.ts +++ b/src/i18n/zh/index.ts @@ -17,7 +17,7 @@ const global = { // 功能键 r_edit: '编辑', r_preview: '预览', - r_copy: '复制', + r_copy: '克隆', r_rename: '重命名', r_publish: '发布', r_unpublish: '取消发布', diff --git a/src/styles/common/style.scss b/src/styles/common/style.scss index 8bd325e6..9fde7bf4 100644 --- a/src/styles/common/style.scss +++ b/src/styles/common/style.scss @@ -80,54 +80,41 @@ word-break: break-all; } -// todo 使用 scss 循环写一套完整的 -// margin -.go-mt-0 { - margin-top: 0 !important; -} +// class:m-1 => margin：1em +// class:mt-1 => margin-top：1em +// m-0|mt-0|mx-0|my-0|p-0|pt-0|... -.go-mb-0 { - margin-bottom: 0 !important; -} -.go-ml-0 { - margin-left: 0 !important; -} +@each $typekey, $type in $spacing-types { + //.m-1 + @each $sizekey, $size in $spacing-sizes { + .go-#{$typekey}-#{$sizekey} { + #{$type}: $size * $spacing-base-size; + } + } -.go-mr-0 { - margin-right: 0 !important; -} + //.mx-1 + @each $sizekey, $size in $spacing-sizes { + .go-#{$typekey}x-#{$sizekey} { + #{$type}-left: $size * $spacing-base-size; + #{$type}-right: $size * $spacing-base-size; + } -.go-my-0 { - @extend .go-mt-0; - @extend .go-mb-0; -} + .go-#{$typekey}y-#{$sizekey} { + #{$type}-top: $size * $spacing-base-size; + #{$type}-bottom: $size * $spacing-base-size; + } + } -.go-mx-0 { - @extend .go-ml-0; - @extend .go-mr-0; -} + //.mt-1 + @each $directionkey, $direction in $spacing-directions { + @each $sizekey, $size in $spacing-sizes { + .go-#{$typekey}#{$directionkey}-#{$sizekey} { + #{$type}-#{$direction}: $size * $spacing-base-size; + } + } + } -.go-pt-0 { - padding-top: 0 !important; -} - -.go-pb-0 { - padding-bottom: 0 !important; -} -.go-pl-0 { - padding-left: 0 !important; -} - -.go-pr-0 { - padding-right: 0 !important; -} - -.go-py-0 { - @extend .go-pt-0; - @extend .go-pb-0; -} - -.go-px-0 { - @extend .go-pl-0; - @extend .go-pr-0; + .go-#{$typekey} { + #{$type}: 0 !important; + } } \ No newline at end of file diff --git a/src/styles/common/var.scss b/src/styles/common/var.scss index c393e4b9..ee4ded0c 100644 --- a/src/styles/common/var.scss +++ b/src/styles/common/var.scss @@ -10,6 +10,31 @@ $--color-text-2: #86909c; $--color-text-3: #c9cdd4; $--color-text-4: #f2f3f5; +//.mt-1 => margin top +//spacing +$spacing-base-size: 1em; + +$spacing-types: ( + m: margin, + p: padding, +); + +$spacing-directions: ( + t: top, + r: right, + b: bottom, + l: left, +); + +$spacing-sizes: ( + 0: 0, + 1: 0.25, + 2: 0.5, + 3: 1, + 4: 1.5, + 5: 2.5, +); + // 变亮值 $--light-shalow: 2%; diff --git a/src/views/chart/ContentConfigurations/components/ChartAnimation/index.vue b/src/views/chart/ContentConfigurations/components/ChartAnimation/index.vue index fb196801..86151033 100644 --- a/src/views/chart/ContentConfigurations/components/ChartAnimation/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartAnimation/index.vue @@ -73,8 +73,8 @@ const addAnimation = (item: { label: string; value: string }) => { width: 100%; } .animation-item { - height: 50px; - line-height: 50px; + height: 40px; + line-height: 40px; text-align: center; cursor: pointer; border-radius: 5px; diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue index 60454dfd..72e3c0cd 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -20,16 +20,10 @@ -