Skip to content

iBiz-Vue-R7
iBiz-Vue-R7
提交 a659d6bf 编写于 作者: tony001's avatar tony001
浏览文件
操作

Merge branch 'dev'

上级 0c47f353 b03b5f8e
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 509 行增加 和 18 行删除
@CONTROL/向导面板/CONTROL-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -4,7 +4,7 @@ ${ctrl.render.code}
<#else>
<layout class="app-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
<#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??>
<el-steps class="wizard-steps" :active="wizardForms.indexOf(activeForm)" finish-status="success" align-center>
<el-steps class="wizard-steps" v-if="isShowStepBar" :active="wizardForms.indexOf(activeForm)" finish-status="success" align-center>
<#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step>
<el-step title="${step.getTitle()}"></el-step>
</#list>
......@@ -86,6 +86,14 @@ ${ctrl.render.code}
*/
public stepTags: any = {};
/**
* 显示步骤栏
*
* @type {Boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public isShowStepBar: Boolean = ${ctrl.isShowStepBar()?c} ;
/**
* 获取多项数据
*
......
@CONTROL/看板视图/CONTROL-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -36,7 +36,7 @@ ${ctrl.render.code}
<#if ctrl.getGroupPSUIActionGroup().getPSUIActions()??>
<#list ctrl.getGroupPSUIActionGroup().getPSUIActions() as action>
<div class="group-action-item">
<i-button long @click="uiAction('${action.getCodeName()}', $event)">
<i-button long @click="uiAction('${action.getCodeName()}', $event, group)">
<#if action.getPSSysImage()??>
<#if action.getPSSysImage().getImagePath()?length gt 0>
<img src="${action.getPSSysImage().getImagePath()}"/>
......@@ -787,12 +787,16 @@ draggable,
/**
* 界面行为
*
* @param {*} tag
* @param {*} $event
* @param {*} tag 界面行为标识
* @param {*} $event
* @param {*} group 看板分组
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public uiAction(tag: any, $event: any) {
public uiAction(tag: any, $event: any, group: any) {
let row = this.selections.length > 0 ? this.selections[0] : {};
if(!row.hasOwnProperty('srfgroup')){
Object.assign(row,{srfgroup: group.value});
}
<#if ctrl.getPSAppViewLogics()??>
<#list ctrl.getPSAppViewLogics() as logic>
<#if logic.getPSAppViewUIAction().getPSUIAction()??>
......
@CONTROL/表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl
浏览文件 @ a659d6bf
......@@ -32,6 +32,7 @@ ${item.render.code}
tempMode='${refView.getTempMode()}'
:data="JSON.stringify(this.data)"
@drdatasaved="drdatasaved($event)"
@viewdataschange="formDataChange({name:'${item.name}',newVal:null,oldVal:null})"
style="<#if item.getPSLayoutPos()?? && item.getPSLayoutPos().getLayout() == "FLEX">height: 100%</#if><#if item.getContentHeight() == 0><#if refView.getHeight() gt 0>height:${refView.getHeight()?c}px</#if><#else>height:${item.getContentHeight()?c}px</#if>;overflow: auto;">
</app-form-druipart>
</#if>
@CONTROL/表单/CONTROL-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -621,7 +621,6 @@ import { Environment } from '@/environments/environment';
<#list ctrl.getPSDEFormItems() as formitem>
<#if formitem.getPSDEFormItemUpdate()??>
<#assign itemUpdate=formitem.getPSDEFormItemUpdate()/>
if(Object.is(name, '${formitem.name}')){
const details: string[] = [<#list itemUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>];
if(await this.checkItem('${formitem.name}')){
......@@ -631,6 +630,17 @@ import { Environment } from '@/environments/environment';
</#if>
</#list>
</#if>
<#if ctrl.getAllPSDEFormDetails()??>
<#list ctrl.getAllPSDEFormDetails() as formDetail>
<#if formDetail.getDetailType() == "DRUIPART" && formDetail.getPSDEFormItemUpdate()??>
<#assign formDetailUpdate = formDetail.getPSDEFormItemUpdate() />
if(Object.is(name, '${formDetail.name}')){
const details: string[] = [<#list formDetailUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>];
this.updateFormItems('${formDetailUpdate.getPSAppDEMethod().getCodeName()}', this.data, details, ${formDetailUpdate.isShowBusyIndicator()?c});
}
</#if>
</#list>
</#if>
}
/**
......
@CONTROL/表格/CONTROL-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -35,6 +35,7 @@ ${ctrl.render.code}
max-height="100%"
</#if>
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1807,6 +1808,17 @@ ${gridColumn.getName()}
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1816,9 +1828,6 @@ ${gridColumn.getName()}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -2102,6 +2111,7 @@ ${gridColumn.getName()}
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
<#if ctrl.getPSAppViewLogics()??>
<#list ctrl.getPSAppViewLogics() as logic>
......
@VIEW/实体分页导航视图/VIEW-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -18,12 +18,12 @@
Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
if(this.$tabPageExp){
let _this:any = this;
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), _this.$t(this.model.srfCaption), _this.model.dataInfo);
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), this.model.srfCaption, _this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });</#noparse>
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.$t(this.model.dataInfo)}` });</#noparse>
}
})
}
......
@VIEW/实体数据看板视图/VIEW-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -21,12 +21,12 @@ this.$forceUpdate();
Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
if(this.$tabPageExp){
let _this:any = this;
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), _this.$t(this.model.srfCaption), _this.model.dataInfo);
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), this.model.srfCaption, _this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });</#noparse>
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.$t(this.model.dataInfo)}` });</#noparse>
}
})
}
......
@VIEW/实体数据看板视图（部件视图卡片）/VIEW-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -31,12 +31,12 @@ this.$forceUpdate();
Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
if(this.$tabPageExp){
let _this:any = this;
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), _this.$t(this.model.srfCaption), _this.model.dataInfo);
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), this.model.srfCaption, _this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });</#noparse>
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.$t(this.model.dataInfo)}` });</#noparse>
}
})
}
......
@VIEW/实体数据看板视图（部件视图）/VIEW-BASE.vue.ftl
浏览文件 @ a659d6bf
......@@ -31,12 +31,12 @@ this.$forceUpdate();
Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
if(this.$tabPageExp){
let _this:any = this;
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), _this.$t(this.model.srfCaption), _this.model.dataInfo);
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfCaption), this.model.srfCaption, _this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });</#noparse>
<#noparse>Object.assign(this.model, { srfCaption: `${this.$t(this.model.srfCaption)} - ${this.$t(this.model.dataInfo)}` });</#noparse>
}
})
}
......
APP/src/locale/index.ts.ftl
浏览文件 @ a659d6bf
......@@ -27,12 +27,20 @@ Object.assign(messages, {
'en-US': Object.assign(iviewEnUsLocale, elementEnLocale, enUs()),
});
</#if>
<#if lans.getLanguage() == 'BO_CN'>
import BOCn from './lang/BO-CN';
import iviewBOCnLocale from './other/iview/BO-CN'
import elementBOLocale from './other/element/BO-CN'
Object.assign(messages, {
'BO-CN': Object.assign(iviewBOCnLocale,elementBOLocale,BOCn()),
});
</#if>
</#list>
</#if>
// 自动根据浏览器系统语言设置语言
const navLang = localStorage.getItem('local') || navigator.language;
const localLang = (navLang === 'zh-CN' || (navLang === 'en-US' && messages.hasOwnProperty('en-US'))) ? navLang : false;
const localLang = (navLang === 'zh-CN' || (navLang === 'en-US' && messages.hasOwnProperty('en-US')) || (navLang === 'ti-US' && messages.hasOwnProperty('ti-US'))) ? navLang : false;
let lang: string = localLang || 'zh-CN';
vueApp.config.lang = lang
......
APP/src/locale/lang/BO-CN-base.ts.ftl 0 → 100644
浏览文件 @ a659d6bf
此差异已折叠。
APP/src/locale/lang/BO-CN.ts.ftl 0 → 100644
浏览文件 @ a659d6bf
<#ibiztemplate>
TARGET=PSSYSAPP
</#ibiztemplate>
import app_BO_CN_Base from './BO-CN-base';
function getLocaleResource(){
const app_BO_CN_OwnData = {};
const targetData = Object.assign(app_BO_CN_Base(), app_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
APP/src/locale/lanres/codelist/codelist_BO_CN.ts.ftl 0 → 100644
浏览文件 @ a659d6bf
<#ibiztemplate>
TARGET=PSSYSAPP
</#ibiztemplate>
import codelist_BO_CN_Base from './codelist_BO_CN_base';
function getLocaleResource(){
const codelist_BO_CN_OwnData = {};
const targetData = Object.assign(codelist_BO_CN_Base(), codelist_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
APP/src/locale/lanres/codelist/codelist_BO_CN_base.ts.ftl 0 → 100644
浏览文件 @ a659d6bf
<#ibiztemplate>
TARGET=PSSYSAPP
</#ibiztemplate>
import commonLogic from '@/locale/logic/common/common-logic';
<#ibizinclude>../../@MACRO/FUNC.ts</#ibizinclude>
<#assign langrestype = 'BO_CN'/>
function getLocaleResourceBase(){
const data:any = {
<#if app.getAllPSAppCodeLists()??>
<#list app.getAllPSAppCodeLists() as codelist>
<#if codelist.getCodeListType() == "STATIC">
${codelist.codeName}: {
<#if codelist.getAllPSCodeItems?? && codelist.getAllPSCodeItems()??>
<#list codelist.getAllPSCodeItems() as codeitem>
"${codeitem.getValue()?j_string}": commonLogic.appcommonhandle("<@getTextLanguage codeitem langrestype />",null),
</#list>
</#if>
"empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null)
},
<#elseif codelist.getCodeListType() == "DYNAMIC">
${codelist.codeName}: {
"empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
},
</#if>
</#list>
</#if>
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_BO_CN.ts.ftl 0 → 100644
浏览文件 @ a659d6bf
<#ibiztemplate>
TARGET=PSAPPDATAENTITY
</#ibiztemplate>
import ${item.getCodeName()}_BO_CN_Base from './${srffilepath2(item.getCodeName())}_BO_CN_base';
function getLocaleResource(){
const ${item.getCodeName()}_BO_CN_OwnData = {};
const targetData = Object.assign(${item.getCodeName()}_BO_CN_Base(), ${item.getCodeName()}_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_BO_CN_base.ts.ftl 0 → 100644
浏览文件 @ a659d6bf
<#ibiztemplate>
TARGET=PSAPPDATAENTITY
</#ibiztemplate>
import commonLogic from '@/locale/logic/common/common-logic';
<#ibizinclude>../../../@MACRO/FUNC.ts</#ibizinclude>
<#assign langrestype = 'BO_CN'/>
<#assign emptyText = '暂无数据'>
function getLocaleResourceBase(){
const data:any = {
<#-- 实体属性输出 -->
<#if item.getAllPSAppDEFields()??>
fields: {
<#list item.getAllPSAppDEFields() as field>
${field.getPSDEField().getCodeName()?lower_case}: commonLogic.appcommonhandle("<@getLogicNameLanguage field.getPSDEField() langrestype />",null),
</#list>
},
</#if>
<#-- 属性值规则输出 -->
<#-- <#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
derules:{
<#list item.getPSDataEntity().getAllPSDEFValueRules() as deValueRule>
<#if deValueRule?? && (deValueRule.isDefaultMode() == false) && deValueRule.getPSDEFVRGroupCondition?? && deValueRule.getPSDEFVRGroupCondition()?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
<#assign deVRConditions = deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() />
<#list deVRConditions as singleCondition>
${deValueRule.getCodeName()?lower_case}<#if singleCondition.getDEFName?? && singleCondition.getDEFName()??>${singleCondition.getDEFName()?lower_case}</#if>${singleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
<#if singleCondition.getPSDEFVRConditions?? && singleCondition.getPSDEFVRConditions()??>
<#list singleCondition.getPSDEFVRConditions() as sonsingleCondition>
${deValueRule.getCodeName()?lower_case}<#if sonsingleCondition.getDEFName?? && sonsingleCondition.getDEFName()??>${sonsingleCondition.getDEFName()?lower_case}</#if>${sonsingleCondition.getCondType()?lower_case}:commonLogic.appcommonhandle("${sonsingleCondition.getRuleInfo()}",null),
</#list>
</#if>
</#list>
</#if>
</#list>
},
</#if> -->
<#-- 实体视图输出 -->
<#if item.getAllPSAppViews()??>
views: {
<#list item.getAllPSAppViews() as obj>
${obj.getPSDEViewCodeName()?lower_case}: {
caption: <#ibizinclude>../../../@MACRO/CAPTIONLANG.ts</#ibizinclude>,
title: commonLogic.appcommonhandle("<@getTitleLanguage obj langrestype />",null),
},
</#list>
},
</#if>
<#-- 实体部件输出 -->
<#if item.getPSControls()??>
<#assign ctrltypes = ['FORM', 'GRID', 'LIST', 'DATAVIEW', 'CHART','KANBAN', 'GANTT', 'TREEGRIDEX', 'SEARCHFORM', 'TOOLBAR', 'TREEVIEW', 'TREEGRIDEX', 'CALENDAR']>
<#list ctrltypes as ctrltype>
<#list item.getPSControls() as ctrl>
<#if ctrl.getControlType() == ctrltype>
<#if !P.exists(ctrltype, ctrl.getCodeName(), "_class_")>
${ctrl.getCodeName()?lower_case}_${ctrl.getControlType()?lower_case}: {
<#if ctrl.getControlType() == 'FORM' || ctrl.getControlType() == 'SEARCHFORM'>
details: {
<#list ctrl.getAllPSDEFormDetails() as obj>
${obj.name?lower_case}: <#ibizinclude>../../../@MACRO/CAPTIONLANG.ts</#ibizinclude>,
</#list>
},
</#if>
<#if ctrl.getControlType() == 'LIST' || ctrl.getControlType() == 'DATAVIEW' || ctrl.getControlType() == 'CHART' || ctrl.getControlType() == 'KANBAN'|| ctrl.getControlType() == 'GANTT' || ctrl.getControlType() == 'TREEGRIDEX' || ctrl.getControlType() == 'CALENDAR' || ctrl.getControlType() == 'TREEVIEW'>
nodata:commonLogic.appcommonhandle("<@getEmptyTextLanguage ctrl langrestype emptyText/>",null),
</#if>
<#if ctrl.getControlType() == 'GRID'>
columns: {
<#if ctrl.getAllPSDEGridColumns()??>
<#list ctrl.getAllPSDEGridColumns() as obj>
${obj.getName()?lower_case}: <#ibizinclude>../../../@MACRO/CAPTIONLANG.ts</#ibizinclude>,
</#list>
</#if>
},
nodata:commonLogic.appcommonhandle("<@getEmptyTextLanguage ctrl langrestype emptyText/>",null),
<#if ctrl.getPSDEDataExport?? && ctrl.getPSDEDataExport()?? >
exportColumns: {
<#if ctrl.getPSDEDataExport().getPSDEDataExportItems()??>
<#list ctrl.getPSDEDataExport().getPSDEDataExportItems() as obj>
${obj.getName()?lower_case}: <#ibizinclude>../../../@MACRO/CAPTIONLANG.ts</#ibizinclude>,
</#list>
</#if>
},
</#if>
</#if>
<#if ctrl.getControlType() == 'TREEVIEW'>
nodes: {
<#if ctrl.getPSDETreeNodes()??>
<#list ctrl.getPSDETreeNodes() as obj>
<#if obj.getTreeNodeType() == 'STATIC'>
${obj.getNodeType()?lower_case}: commonLogic.appcommonhandle("<@getNameLanguage obj langrestype />",null),
</#if>
</#list>
</#if>
},
</#if>
<#if ctrl.getControlType() == 'TOOLBAR'>
<#if ctrl.getAllPSDEToolbarItems()??>
<#list ctrl.getAllPSDEToolbarItems() as obj>
${obj.getName()?lower_case}: {
caption: <#ibizinclude>../../../@MACRO/CAPTIONLANG.ts</#ibizinclude>,
tip: commonLogic.appcommonhandle("<#ibizinclude>../../../@MACRO/TIPLANG.ts</#ibizinclude>",null),
},
</#list>
</#if>
</#if>
<#-- 部件界面行为 -->
<#if ctrl.getPSUIActions?? && ctrl.getPSUIActions()??>
uiactions: {
<#list ctrl.getPSUIActions() as obj>
<#if obj.getPSAppDataEntity?? && obj.getPSAppDataEntity()??>${obj.getPSAppDataEntity().getCodeName()?lower_case}_</#if>${obj.getUIActionTag()?lower_case}: <#ibizinclude>../../../@MACRO/CAPTIONLANG.ts</#ibizinclude>,
</#list>
},
</#if>
},
</#if>
</#if>
</#list>
</#list>
</#if>
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
APP/src/locale/local-list.ts.ftl
浏览文件 @ a659d6bf
......@@ -15,6 +15,12 @@ export const localList: any[] = [
name: 'English',
},
</#if>
<#if lans.getLanguage() == 'BO_CN'>
{
type: 'BO-CN',
name: 'བོད་ཡིག',
},
</#if>
</#list>
</#if>
];
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或