提交 9d1798e6 编写于 作者: tony001's avatar tony001

update:更新

上级 e74dc6ef
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
viewCaption: '{{page.caption}}', viewCaption: '{{page.caption}}',
height: '{{page.height}}', height: '{{page.height}}',
width: '{{page.width}}', width: '{{page.width}}',
"appEntityName":"{{page.appEntity.codeName}}", appEntityName:'{{page.appEntity.codeName}}',
{{!-- viewMsgGroup: '{{page.psAppViewMsgGroup}}', --}} {{!-- viewMsgGroup: '{{page.psAppViewMsgGroup}}', --}}
{{!-- viewUIActions: '{{page.psAppViewUIActions}}', --}} {{!-- viewUIActions: '{{page.psAppViewUIActions}}', --}}
viewSysCss: '{{page.psSysCss}}', viewSysCss: '{{page.psSysCss}}',
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
openDataViewName:'ExampleEditorEditView', openDataViewName:'ExampleEditorEditView',
appViewNavContexts:{{> @macro/front-end/common/navparam.hbs appNavParams=page.psAppViewNavContexts}}, appViewNavContexts:{{> @macro/front-end/common/navparam.hbs appNavParams=page.psAppViewNavContexts}},
appViewNavParams:{{> @macro/front-end/common/navparam.hbs appNavParams=page.getPSAppViewNavParams}}, appViewNavParams:{{> @macro/front-end/common/navparam.hbs appNavParams=page.getPSAppViewNavParams}},
viewToolbarModel: [ toolbar: [
{{#page.viewToolBarItems}} {{#page.viewToolBarItems}}
{{#items}} {{#items}}
{ id:'{{id}}',name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}',disabled: false, visible: true, imgPath: '{{imgPath}}',iconClass: '{{iconClass}}',xDataControlName:'{{xDataControlName}}',{{#if uIAction}}uIAction:{codeName:'{{uIAction.codeName}}',fullCodeName:'{{uIAction.fullCodeName}}',uIActionMode:'{{uIAction.uIActionMode}}',uIActionTag:'{{uIAction.uIActionTag}}',uIActionType:'{{uIAction.uIActionType}}'}{{/if}} }, { id:'{{id}}',name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}',disabled: false, visible: true, imgPath: '{{imgPath}}',iconClass: '{{iconClass}}',xDataControlName:'{{xDataControlName}}',{{#if uIAction}}uIAction:{codeName:'{{uIAction.codeName}}',fullCodeName:'{{uIAction.fullCodeName}}',uIActionMode:'{{uIAction.uIActionMode}}',uIActionTag:'{{uIAction.uIActionTag}}',uIActionType:'{{uIAction.uIActionType}}'}{{/if}} },
......
...@@ -46,6 +46,7 @@ export class ViewBase { ...@@ -46,6 +46,7 @@ export class ViewBase {
public handleViewContextParams(props: ViewPropsBase, context: Ref<IParam | undefined>, viewParams: Ref<IParam | undefined>) { public handleViewContextParams(props: ViewPropsBase, context: Ref<IParam | undefined>, viewParams: Ref<IParam | undefined>) {
if (!context.value) context.value = {}; if (!context.value) context.value = {};
if (!viewParams.value) viewParams.value = {}; if (!viewParams.value) viewParams.value = {};
const { appViewNavContexts, appViewNavParams } = this.viewState;
if (Object.is(props.openType, 'ROUTE')) { if (Object.is(props.openType, 'ROUTE')) {
// 应用上下文 // 应用上下文
const appContext = App.getAppData(); const appContext = App.getAppData();
...@@ -73,17 +74,17 @@ export class ViewBase { ...@@ -73,17 +74,17 @@ export class ViewBase {
} }
Object.assign(viewParams.value, pageViewParams); Object.assign(viewParams.value, pageViewParams);
// 视图自定义应用上下文 // 视图自定义应用上下文
const pageCustomContext = UIUtil.computedNavData(null, context.value, viewParams.value, this.viewState.appViewNavContexts); const pageCustomContext = UIUtil.computedNavData(null, context.value, viewParams.value, appViewNavContexts);
Object.assign(context.value, pageCustomContext); Object.assign(context.value, pageCustomContext);
// 视图自定义视图参数 // 视图自定义视图参数
const pageCustomViewParams = UIUtil.computedNavData(null, context.value, viewParams.value, this.viewState.appViewNavParams); const pageCustomViewParams = UIUtil.computedNavData(null, context.value, viewParams.value, appViewNavParams);
Object.assign(viewParams.value, pageCustomViewParams); Object.assign(viewParams.value, pageCustomViewParams);
} else { } else {
// 视图自定义应用上下文 // 视图自定义应用上下文
const customContext = UIUtil.computedNavData(null, context.value, viewParams.value, this.viewState.appViewNavContexts); const customContext = UIUtil.computedNavData(null, context.value, viewParams.value, appViewNavContexts);
Object.assign(context.value, customContext); Object.assign(context.value, customContext);
// 视图自定义视图参数 // 视图自定义视图参数
const pageCustomViewParams = UIUtil.computedNavData(null, context.value, viewParams.value, this.viewState.appViewNavParams); const pageCustomViewParams = UIUtil.computedNavData(null, context.value, viewParams.value, appViewNavParams);
Object.assign(viewParams.value, pageCustomViewParams); Object.assign(viewParams.value, pageCustomViewParams);
} }
} }
......
...@@ -50,7 +50,7 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro ...@@ -50,7 +50,7 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro
<IbizToolbar <IbizToolbar
mode="button" mode="button"
name="{{lowerCase codeName}}" name="{{lowerCase codeName}}"
:actionModel="state.viewToolbarModel" :actionModel="state.toolbar"
@toolbarEvent="handleToolbarEvent"/> @toolbarEvent="handleToolbarEvent"/>
</template> </template>
{{/eq}} {{/eq}}
......
...@@ -44,7 +44,7 @@ const { state, handleCtrlEvent, handleToolbarEvent } = new GridView(ViewConfig). ...@@ -44,7 +44,7 @@ const { state, handleCtrlEvent, handleToolbarEvent } = new GridView(ViewConfig).
<IbizToolbar <IbizToolbar
mode="button" mode="button"
name="{{lowerCase codeName}}" name="{{lowerCase codeName}}"
:actionModel="state.viewToolbarModel" :actionModel="state.toolbar"
@toolbarEvent="handleToolbarEvent"/> @toolbarEvent="handleToolbarEvent"/>
</template> </template>
{{/eq}} {{/eq}}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册