center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev@dataset

Browse Source
This commit is contained in:
taojinlong 2022-10-27 10:48:06 +08:00
commit 9979723d2e
14 changed files with 223 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
View File

@ -9,6 +9,8 @@ import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.dingtalk.dto.response.DingQrResult;
@ -101,6 +103,8 @@ public class XDingtalkServer {
sysUserService.validateExistUser(username, dingUserEntity.getName(), email);
sysUserService.saveDingtalkCUser(dingUserEntity, email);
sysUserEntity = authUserService.getUserByDingtalkId(username);
} else if (sysUserEntity.getEnabled() == 0) {
DataEaseException.throwException(Translator.get("i18n_user_is_disable"));
}
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword();

4
backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
View File

@ -9,6 +9,8 @@ import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
@ -102,6 +104,8 @@ public class XLarkServer {
sysUserService.validateExistUser(username, larkUserInfo.getName(), email);
sysUserService.saveLarkCUser(larkUserInfo, email);
sysUserEntity = authUserService.getUserByLarkId(username);
} else if (sysUserEntity.getEnabled() == 0) {
DataEaseException.throwException(Translator.get("i18n_user_is_disable"));
}
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword();

4
backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java
View File

@ -9,6 +9,8 @@ import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
@ -102,6 +104,8 @@ public class XLarksuiteServer {
sysUserService.validateExistUser(username, larkUserInfo.getName(), email);
sysUserService.saveLarksuiteCUser(larkUserInfo, email);
sysUserEntity = authUserService.getUserByLarksuiteId(username);
} else if (sysUserEntity.getEnabled() == 0) {
DataEaseException.throwException(Translator.get("i18n_user_is_disable"));
}
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword();

4
backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
View File

@ -10,6 +10,8 @@ import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
@ -106,6 +108,8 @@ public class XWecomServer {
sysUserService.validateExistUser(userId, userMap.get("name").toString(), email);
sysUserService.saveWecomCUser(userMap, userId, email);
sysUserEntity = authUserService.getUserByWecomId(userId);
} else if (sysUserEntity.getEnabled() == 0) {
DataEaseException.throwException(Translator.get("i18n_user_is_disable"));
}
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword();

1
frontend/src/components/DeDrag/index.vue
View File

@ -44,7 +44,6 @@
@resizeView="resizeView"
@linkJumpSet="linkJumpSet"
@boardSet="boardSet"
@fieldSelect="fieldSelect"
/>
<mobile-check-bar
v-if="mobileCheckBarShow"

2
frontend/src/components/canvas/components/Editor/EditBar.vue
View File

@ -200,7 +200,7 @@ export default {
},
sourceElement: {
type: Object,
required: true
default: () => {}
},
element: {
type: Object,

2
frontend/src/views/chart/chart/util.js
View File

@ -3218,3 +3218,5 @@ export function getRemark(chart) {
}
return remark
}
export const quotaViews = ['label', 'richTextView', 'text', 'gauge', 'liquid']

9
frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
View File

@ -175,7 +175,10 @@
:disabled="disableEditCompare"
:command="beforeQuickCalc('setting')"
>{{ $t('chart.yoy_label') }}...</el-dropdown-item>
<el-dropdown-item :command="beforeQuickCalc('percent')">{{ $t('chart.percent') }}</el-dropdown-item>
<el-dropdown-item
:disabled="quotaViews.indexOf(chart.type) > -1"
:command="beforeQuickCalc('percent')"
>{{ $t('chart.percent') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>
@ -242,6 +245,7 @@ import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-i
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter'
import { quotaViews } from '@/views/chart/chart/util'
export default {
name: 'QuotaExtItem',
@ -277,7 +281,8 @@ export default {
compareItem: compareItem,
disableEditCompare: false,
tagType: 'success',
formatterItem: formatterItem
formatterItem: formatterItem,
quotaViews: quotaViews
}
},
watch: {

9
frontend/src/views/chart/components/drag-item/QuotaItem.vue
View File

@ -175,7 +175,10 @@
:disabled="disableEditCompare"
:command="beforeQuickCalc('setting')"
>{{ $t('chart.yoy_label') }}...</el-dropdown-item>
<el-dropdown-item :command="beforeQuickCalc('percent')">{{ $t('chart.percent') }}</el-dropdown-item>
<el-dropdown-item
:disabled="quotaViews.indexOf(chart.type) > -1"
:command="beforeQuickCalc('percent')"
>{{ $t('chart.percent') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>
@ -242,6 +245,7 @@ import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-i
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter'
import { quotaViews } from '@/views/chart/chart/util'
export default {
name: 'QuotaItem',
@ -277,7 +281,8 @@ export default {
compareItem: compareItem,
disableEditCompare: false,
tagType: 'success',
formatterItem: formatterItem
formatterItem: formatterItem,
quotaViews: quotaViews
}
},
watch: {

176
frontend/src/views/chart/components/shape-attr/SizeSelector.vue
View File

@ -541,97 +541,99 @@
@change="changeBarSizeCase('dimensionShow')"
>{{ $t('chart.show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontSize')"
:label="$t('chart.dimension_font_size')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionFontSize"
:placeholder="$t('chart.dimension_font_size')"
@change="changeBarSizeCase('dimensionFontSize')"
<div v-show="sizeForm.dimensionShow">
<el-form-item
v-show="showProperty('dimensionFontSize')"
:label="$t('chart.dimension_font_size')"
class="form-item"
>
<el-option
v-for="option in fontSize"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontFamily')"
:label="$t('chart.dimension_font_family')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionFontFamily"
:placeholder="$t('chart.dimension_font_family')"
@change="changeBarSizeCase('dimensionFontFamily')"
<el-select
v-model="sizeForm.dimensionFontSize"
:placeholder="$t('chart.dimension_font_size')"
@change="changeBarSizeCase('dimensionFontSize')"
>
<el-option
v-for="option in fontSize"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontFamily')"
:label="$t('chart.dimension_font_family')"
class="form-item"
>
<el-option
v-for="option in fontFamily"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontStyle')"
:label="$t('chart.dimension_text_style')"
class="form-item"
>
<el-checkbox
v-model="sizeForm.dimensionFontIsItalic"
@change="changeBarSizeCase('dimensionFontIsItalic')"
>{{ $t('chart.italic') }}</el-checkbox>
<el-checkbox
v-model="sizeForm.dimensionFontIsBolder"
@change="changeBarSizeCase('dimensionFontIsBolder')"
>{{ $t('chart.bolder') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionLetterSpace')"
:label="$t('chart.dimension_letter_space')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionLetterSpace"
:placeholder="$t('chart.dimension_letter_space')"
@change="changeBarSizeCase('dimensionLetterSpace')"
<el-select
v-model="sizeForm.dimensionFontFamily"
:placeholder="$t('chart.dimension_font_family')"
@change="changeBarSizeCase('dimensionFontFamily')"
>
<el-option
v-for="option in fontFamily"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontStyle')"
:label="$t('chart.dimension_text_style')"
class="form-item"
>
<el-option
v-for="option in fontLetterSpace"
:key="option.value"
:label="option.name"
:value="option.value"
<el-checkbox
v-model="sizeForm.dimensionFontIsItalic"
@change="changeBarSizeCase('dimensionFontIsItalic')"
>{{ $t('chart.italic') }}</el-checkbox>
<el-checkbox
v-model="sizeForm.dimensionFontIsBolder"
@change="changeBarSizeCase('dimensionFontIsBolder')"
>{{ $t('chart.bolder') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionLetterSpace')"
:label="$t('chart.dimension_letter_space')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionLetterSpace"
:placeholder="$t('chart.dimension_letter_space')"
@change="changeBarSizeCase('dimensionLetterSpace')"
>
<el-option
v-for="option in fontLetterSpace"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontShadow')"
:label="$t('chart.font_shadow')"
class="form-item"
>
<el-checkbox
v-model="sizeForm.dimensionFontShadow"
@change="changeBarSizeCase('dimensionFontShadow')"
>{{ $t('chart.font_shadow') }}</el-checkbox>
</el-form-item>
<el-divider v-if="showProperty('spaceSplit')" />
<el-form-item
v-show="showProperty('spaceSplit')"
:label="$t('chart.space_split')"
class="form-item"
>
<el-input-number
v-model="sizeForm.spaceSplit"
:min="0"
size="mini"
@change="changeBarSizeCase('spaceSplit')"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontShadow')"
:label="$t('chart.font_shadow')"
class="form-item"
>
<el-checkbox
v-model="sizeForm.dimensionFontShadow"
@change="changeBarSizeCase('dimensionFontShadow')"
>{{ $t('chart.font_shadow') }}</el-checkbox>
</el-form-item>
<el-divider v-if="showProperty('spaceSplit')" />
<el-form-item
v-show="showProperty('spaceSplit')"
:label="$t('chart.space_split')"
class="form-item"
>
<el-input-number
v-model="sizeForm.spaceSplit"
:min="0"
size="mini"
@change="changeBarSizeCase('spaceSplit')"
/>
</el-form-item>
</el-form-item>
</div>
<!--text&label-end-->
<!--scatter-begin-->
<el-form-item

176
frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
View File

@ -892,97 +892,99 @@
@change="changeBarSizeCase('dimensionShow')"
>{{ $t('chart.show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontSize')"
:label="$t('chart.dimension_font_size')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionFontSize"
:placeholder="$t('chart.dimension_font_size')"
@change="changeBarSizeCase('dimensionFontSize')"
<div v-show="sizeForm.dimensionShow">
<el-form-item
v-show="showProperty('dimensionFontSize')"
:label="$t('chart.dimension_font_size')"
class="form-item"
>
<el-option
v-for="option in fontSize"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontFamily')"
:label="$t('chart.dimension_font_family')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionFontFamily"
:placeholder="$t('chart.dimension_font_family')"
@change="changeBarSizeCase('dimensionFontFamily')"
<el-select
v-model="sizeForm.dimensionFontSize"
:placeholder="$t('chart.dimension_font_size')"
@change="changeBarSizeCase('dimensionFontSize')"
>
<el-option
v-for="option in fontSize"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontFamily')"
:label="$t('chart.dimension_font_family')"
class="form-item"
>
<el-option
v-for="option in fontFamily"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontStyle')"
:label="$t('chart.dimension_text_style')"
class="form-item"
>
<el-checkbox
v-model="sizeForm.dimensionFontIsItalic"
@change="changeBarSizeCase('dimensionFontIsItalic')"
>{{ $t('chart.italic') }}</el-checkbox>
<el-checkbox
v-model="sizeForm.dimensionFontIsBolder"
@change="changeBarSizeCase('dimensionFontIsBolder')"
>{{ $t('chart.bolder') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionLetterSpace')"
:label="$t('chart.dimension_letter_space')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionLetterSpace"
:placeholder="$t('chart.dimension_letter_space')"
@change="changeBarSizeCase('dimensionLetterSpace')"
<el-select
v-model="sizeForm.dimensionFontFamily"
:placeholder="$t('chart.dimension_font_family')"
@change="changeBarSizeCase('dimensionFontFamily')"
>
<el-option
v-for="option in fontFamily"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontStyle')"
:label="$t('chart.dimension_text_style')"
class="form-item"
>
<el-option
v-for="option in fontLetterSpace"
:key="option.value"
:label="option.name"
:value="option.value"
<el-checkbox
v-model="sizeForm.dimensionFontIsItalic"
@change="changeBarSizeCase('dimensionFontIsItalic')"
>{{ $t('chart.italic') }}</el-checkbox>
<el-checkbox
v-model="sizeForm.dimensionFontIsBolder"
@change="changeBarSizeCase('dimensionFontIsBolder')"
>{{ $t('chart.bolder') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionLetterSpace')"
:label="$t('chart.dimension_letter_space')"
class="form-item"
>
<el-select
v-model="sizeForm.dimensionLetterSpace"
:placeholder="$t('chart.dimension_letter_space')"
@change="changeBarSizeCase('dimensionLetterSpace')"
>
<el-option
v-for="option in fontLetterSpace"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontShadow')"
:label="$t('chart.font_shadow')"
class="form-item"
>
<el-checkbox
v-model="sizeForm.dimensionFontShadow"
@change="changeBarSizeCase('dimensionFontShadow')"
>{{ $t('chart.font_shadow') }}</el-checkbox>
</el-form-item>
<el-divider v-if="showProperty('spaceSplit')" />
<el-form-item
v-show="showProperty('spaceSplit')"
:label="$t('chart.space_split')"
class="form-item"
>
<el-input-number
v-model="sizeForm.spaceSplit"
:min="0"
size="mini"
@change="changeBarSizeCase('spaceSplit')"
/>
</el-select>
</el-form-item>
<el-form-item
v-show="showProperty('dimensionFontShadow')"
:label="$t('chart.font_shadow')"
class="form-item"
>
<el-checkbox
v-model="sizeForm.dimensionFontShadow"
@change="changeBarSizeCase('dimensionFontShadow')"
>{{ $t('chart.font_shadow') }}</el-checkbox>
</el-form-item>
<el-divider v-if="showProperty('spaceSplit')" />
<el-form-item
v-show="showProperty('spaceSplit')"
:label="$t('chart.space_split')"
class="form-item"
>
<el-input-number
v-model="sizeForm.spaceSplit"
:min="0"
size="mini"
@change="changeBarSizeCase('spaceSplit')"
/>
</el-form-item>
</el-form-item>
</div>
<!--text&label-end-->
<!--scatter-begin-->
<el-form-item

13
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -1589,6 +1589,7 @@ import ScrollCfg from '@/views/chart/components/senior/ScrollCfg'
import ChartFieldEdit from '@/views/chart/view/ChartFieldEdit'
import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit'
import { equalsAny } from '@/utils/StringUtils'
import { quotaViews } from '@/views/chart/chart/util'
export default {
name: 'ChartEdit',
@ -1748,7 +1749,6 @@ export default {
tabActive: 'data',
currentAreaCode: '',
showStackCustomSort: false
}
},
computed: {
@ -2094,6 +2094,10 @@ export default {
if (!ele.compareCalc) {
ele.compareCalc = compareItem
}
if (quotaViews.indexOf(view.type) > -1) {
ele.compareCalc = compareItem
ele.formatterCfg.type = 'auto'
}
})
if (view.type === 'chart-mix') {
view.yaxisExt.forEach(function(ele) {
@ -2121,6 +2125,10 @@ export default {
if (!ele.compareCalc) {
ele.compareCalc = compareItem
}
if (quotaViews.indexOf(view.type) > -1) {
ele.compareCalc = compareItem
ele.formatterCfg.type = 'auto'
}
})
}
view.extStack.forEach(function(ele) {
@ -2167,9 +2175,6 @@ export default {
if (view.type === 'line' && trigger === 'chart') {
view.customAttr.size.lineArea = false
}
if (view.type === 'treemap' && trigger === 'chart') {
view.customAttr.label.show = true
}
if (view.type === 'liquid' ||
(view.type.includes('table') && view.render === 'echarts') ||
view.type.includes('text') ||

4
frontend/src/views/panel/edit/index.vue
View File

@ -811,8 +811,8 @@ export default {
},
initEvents() {
bus.$on('component-on-drag', this.componentOnDrag)
// bus.$on('component-dialog-edit', this.editDialog)
// bus.$on('button-dialog-edit', this.editButtonDialog)
bus.$on('component-dialog-edit', this.editDialog)
bus.$on('button-dialog-edit', this.editButtonDialog)
bus.$on('component-dialog-style', this.componentDialogStyle)
bus.$on('previewFullScreenClose', this.previewFullScreenClose)
bus.$on('change_panel_right_draw', this.changeRightDrawOpen)

2
frontend/src/views/panel/list/PanelList.vue
View File

@ -199,7 +199,7 @@
:command="beforeClickEdit('folder', 'new', data, node)"
>
<svg-icon icon-class="scene" />
<span>{{ $t('panel.groupAdd') }}</span>
<span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
</el-dropdown-item>
<el-dropdown-item
:command="beforeClickEdit('panel', 'new', data, node)"