forked from github/dataease
refactor: 优化文案样式等
* refactor: UI * refactor: UI * refactor: UI * refactor: UI * refactor: 优化文案样式等
This commit is contained in:
parent
c64d54ade5
commit
229ed8ad45
@ -119,5 +119,9 @@ export default {
|
||||
minute_limit: 'Minutes cannot be less than 1 and greater than 59',
|
||||
hour_limit: 'Hours cannot be less than 1 and greater than 23',
|
||||
day_limit: 'Days cannot be less than 1 and greater than 31'
|
||||
},
|
||||
template_manage: {
|
||||
name_already_exists_type: 'Classification name already exists',
|
||||
the_same_category: 'The template name already exists under the same category'
|
||||
}
|
||||
}
|
||||
|
@ -148,5 +148,9 @@ export default {
|
||||
minute_limit: '分鍾不能小於1,大於59',
|
||||
hour_limit: '小時不能小於1,大於23',
|
||||
day_limit: '天不能小於1,大於31'
|
||||
},
|
||||
template_manage: {
|
||||
name_already_exists_type: '分类名称已存在',
|
||||
the_same_category: '同一分类下,该模板名称已存在'
|
||||
}
|
||||
}
|
||||
|
@ -2127,5 +2127,9 @@ export default {
|
||||
autoCreateUser: '第三方自动创建用户',
|
||||
dsIntervalTime: '数据源检测时间间隔',
|
||||
dsExecuteTime: '数据源检测频率'
|
||||
},
|
||||
template_manage: {
|
||||
name_already_exists_type: '分类名称已存在',
|
||||
the_same_category: '同一分类下,该模板名称已存在'
|
||||
}
|
||||
}
|
||||
|
@ -1082,7 +1082,7 @@ const calcEle = () => {
|
||||
|
||||
const setCacheId = () => {
|
||||
nextTick(() => {
|
||||
if (!cacheId || !!view.value.tableId) return
|
||||
if (!cacheId || !!view.value.tableId || templateStatusShow.value) return
|
||||
view.value.tableId = cacheId as unknown as number
|
||||
})
|
||||
}
|
||||
|
@ -42,9 +42,6 @@ const searchResult = computed(
|
||||
)
|
||||
|
||||
const showFlagCheck = template => {
|
||||
if (!template.categoryNames) {
|
||||
console.log('===templateTest' + JSON.stringify(template))
|
||||
}
|
||||
return template.showFlag && template.categoryNames?.includes(props.label)
|
||||
}
|
||||
|
||||
|
@ -174,7 +174,7 @@ const close = () => {
|
||||
emits('close')
|
||||
}
|
||||
|
||||
const title = computed(() => (state.curPosition === 'branch' ? '模板中心' : '使用模版新建'))
|
||||
const title = computed(() => (state.curPosition === 'branch' ? '模板中心' : '使用模板新建'))
|
||||
|
||||
const state = reactive({
|
||||
initReady: true,
|
||||
@ -273,7 +273,6 @@ const categoriesComputed = computed(() => {
|
||||
category => category.source === 'public' || category.source === state.templateSourceType
|
||||
)
|
||||
}
|
||||
console.log('categoriesComputed=' + JSON.stringify(result))
|
||||
return result
|
||||
})
|
||||
|
||||
@ -456,7 +455,7 @@ const templateShow = templateItem => {
|
||||
|
||||
const templatePreview = previewId => {
|
||||
if (state.curPosition === 'branch') {
|
||||
// 模版中心模式
|
||||
// 模板中心模式
|
||||
state.templatePreviewId = previewId
|
||||
previewModel.value = 'marketPreview'
|
||||
} else {
|
||||
|
@ -297,7 +297,7 @@ initMarketTemplate()
|
||||
<el-icon class="main-color-quick">
|
||||
<Icon name="icon_template_colorful" />
|
||||
</el-icon>
|
||||
<span class="name">使用模版新建</span>
|
||||
<span class="name">使用模板新建</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -16,7 +16,7 @@ public class MarketMetaDataVO {
|
||||
private String value;
|
||||
private String label;
|
||||
|
||||
// market 模板中心 manage 模版管理 public 公共
|
||||
// market 模板中心 manage 模板管理 public 公共
|
||||
private String source = CommonConstants.TEMPLATE_SOURCE.MARKET;
|
||||
|
||||
public MarketMetaDataVO(String value, String label) {
|
||||
|
Loading…
Reference in New Issue
Block a user