提交 abe9092e 编写于 作者: WodahsOrez's avatar WodahsOrez

fix: 报错修复

上级 41e90bc5
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
{{#if item.psEditor.psAppDataEntity}} {{#if item.psEditor.psAppDataEntity}}
{{!-- deMajorField="getDeMajorField({{item.psEditor.psAppDataEntity.codeName}})" --}} {{!-- deMajorField="getDeMajorField({{item.psEditor.psAppDataEntity.codeName}})" --}}
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
{{~#if item.psEditor.psAppCodeList.valueSeparator}}valueSeparator="{{item.psEditor.psAppCodeList.valueSeparator}}"{{/if}} {{~#if item.psEditor.psAppCodeList.valueSeparator}}valueSeparator="{{item.psEditor.psAppCodeList.valueSeparator}}"{{/if}}
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
:disabled="state.detailsModel.{{item.codeName}}.disabled" :disabled="state.detailsModel.{{item.codeName}}.disabled"
{{/eq}} {{/eq}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
:disabled="state.detailsModel.{{item.codeName}}.disabled" :disabled="state.detailsModel.{{item.codeName}}.disabled"
{{/eq}} {{/eq}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{!-- localParam="{{item.psEditor.psNavigateParams}}" --}} {{!-- :localParam="{{item.psEditor.psNavigateParams}}" --}}
{{/if}} {{/if}}
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
:multiple="{{item.psEditor.editorParams.multiple}}" :multiple="{{item.psEditor.editorParams.multiple}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
{{#eq item.psEditor.editorType "MDROPDOWNLIST"}} {{#eq item.psEditor.editorType "MDROPDOWNLIST"}}
:multiple="true" :multiple="true"
......
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
{{#if item.psEditor.psAppCodeList.valueSeparator}}valueSeparator="{{item.psEditor.psAppCodeList.valueSeparator}}"{{/if}} {{#if item.psEditor.psAppCodeList.valueSeparator}}valueSeparator="{{item.psEditor.psAppCodeList.valueSeparator}}"{{/if}}
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
:readonly="{{item.psEditor.readOnly}}" :readonly="{{item.psEditor.readOnly}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
:precision="{{item.psEditor.precision}}" :precision="{{item.psEditor.precision}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateContexts}} {{#if item.psEditor.psNavigateContexts}}
localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}" :localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
{{/if}} {{/if}}
{{#if item.psEditor.psNavigateParams}} {{#if item.psEditor.psNavigateParams}}
localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}" :localParam="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateParams}}"
{{/if}} {{/if}}
{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}} {{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
:value="state.data.{{item.psEditor.name}}" :value="state.data.{{item.psEditor.name}}"
......
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
</a-col> </a-col>
{{/each}} {{/each}}
</a-row> </a-row>
{{/eq}} {{/eq}}
\ No newline at end of file
...@@ -3,9 +3,9 @@ import { IActionParam } from '@core'; ...@@ -3,9 +3,9 @@ import { IActionParam } from '@core';
interface FormGroupProps { interface FormGroupProps {
name: string; name: string;
label: string; label?: string;
required: boolean; required?: boolean;
labelWidth: number; labelWidth?: number;
rules?: any; rules?: any;
error?: string; error?: string;
titleStyle?: string; titleStyle?: string;
...@@ -13,7 +13,9 @@ interface FormGroupProps { ...@@ -13,7 +13,9 @@ interface FormGroupProps {
interface FormGroupEmit { interface FormGroupEmit {
(name: 'componentEvent', value: IActionParam): void; (name: 'componentEvent', value: IActionParam): void;
} }
const props = withDefaults(defineProps<FormGroupProps>(), {}); const props = withDefaults(defineProps<FormGroupProps>(), {
required: false,
});
const emit = defineEmits<FormGroupEmit>(); const emit = defineEmits<FormGroupEmit>();
onBeforeMount(() => { onBeforeMount(() => {
......
...@@ -56,7 +56,7 @@ interface CheckboxListProps { ...@@ -56,7 +56,7 @@ interface CheckboxListProps {
* @type {string} * @type {string}
* @memberof CheckboxListProps * @memberof CheckboxListProps
*/ */
codeListTag: string; codeListTag?: string;
/** /**
* 代码表类型 * 代码表类型
...@@ -64,7 +64,7 @@ interface CheckboxListProps { ...@@ -64,7 +64,7 @@ interface CheckboxListProps {
* @type {string} * @type {string}
* @memberof CheckboxListProps * @memberof CheckboxListProps
*/ */
codeListType: string; codeListType?: string;
/** /**
* 视图上下文 * 视图上下文
......
...@@ -11,7 +11,7 @@ interface DataPickerViewProps { ...@@ -11,7 +11,7 @@ interface DataPickerViewProps {
/** /**
* @description 值项 * @description 值项
*/ */
valueItem: string; valueItem?: string;
/** /**
* @description 编辑器值 * @description 编辑器值
......
...@@ -11,7 +11,7 @@ interface DataPickerProps { ...@@ -11,7 +11,7 @@ interface DataPickerProps {
/** /**
* @description 值项 * @description 值项
*/ */
valueItem: string; valueItem?: string;
/** /**
* @description 编辑器值 * @description 编辑器值
...@@ -104,6 +104,8 @@ interface DataPickerProps { ...@@ -104,6 +104,8 @@ interface DataPickerProps {
noAc?:boolean; noAc?:boolean;
showButton?:boolean;
isDropdown?: boolean; isDropdown?: boolean;
} }
interface EditorEmit { interface EditorEmit {
......
...@@ -56,7 +56,7 @@ interface DropdownListProps { ...@@ -56,7 +56,7 @@ interface DropdownListProps {
/** /**
* @description 代码表标识 * @description 代码表标识
*/ */
codeListTag: string; codeListTag?: string;
/** /**
* @description 代码表类型 * @description 代码表类型
......
...@@ -56,7 +56,7 @@ interface ListBoxProps { ...@@ -56,7 +56,7 @@ interface ListBoxProps {
* @type {string} * @type {string}
* @memberof ListBoxProps * @memberof ListBoxProps
*/ */
codeListTag: string; codeListTag?: string;
/** /**
* 代码表类型 * 代码表类型
......
...@@ -32,7 +32,7 @@ interface RadioGroupProps { ...@@ -32,7 +32,7 @@ interface RadioGroupProps {
* @type {string} * @type {string}
* @memberof AppCheckBox * @memberof AppCheckBox
*/ */
codeListTag: string; codeListTag?: string;
/** /**
* 代码表类型 * 代码表类型
...@@ -40,7 +40,7 @@ interface RadioGroupProps { ...@@ -40,7 +40,7 @@ interface RadioGroupProps {
* @type {string} * @type {string}
* @memberof AppCheckBox * @memberof AppCheckBox
*/ */
codeListType: string; codeListType?: string;
/** /**
* 视图上下文 * 视图上下文
......
...@@ -30,7 +30,8 @@ export const Environment = { ...@@ -30,7 +30,8 @@ export const Environment = {
// 仿真mockDcSystemId // 仿真mockDcSystemId
mockDcSystemId: '', mockDcSystemId: '',
// 登录地址 // 登录地址
loginUrl: '' loginUrl: '',
enableIssue: false,
}; };
// 挂载外部配置文件 // 挂载外部配置文件
if ((window as any).Environment) { if ((window as any).Environment) {
......
...@@ -22,7 +22,7 @@ interface CtrlEmit { ...@@ -22,7 +22,7 @@ interface CtrlEmit {
const emit = defineEmits<CtrlEmit>(); const emit = defineEmits<CtrlEmit>();
// 安装功能模块,提供状态和能力方法 // 安装功能模块,提供状态和能力方法
const { name, state } = new SearchBarControl(CtrlConfig).moduleInstall(props, emit); const { name, state } = new SearchBarControl(CtrlConfig, props, emit).moduleInstall();
// 暴露内部状态及能力 // 暴露内部状态及能力
defineExpose({ name, state}); defineExpose({ name, state});
......
...@@ -17,7 +17,6 @@ interface Props { ...@@ -17,7 +17,6 @@ interface Props {
name:string, name:string,
context: IContext; context: IContext;
viewParams?: IParam; viewParams?: IParam;
controlAction: ControlAction;
showBusyIndicator?: boolean; showBusyIndicator?: boolean;
viewMode?: number; viewMode?: number;
viewSubject: Subject<IActionParam>; viewSubject: Subject<IActionParam>;
...@@ -54,6 +53,7 @@ defineExpose({ name, state }); ...@@ -54,6 +53,7 @@ defineExpose({ name, state });
{{#eq controlType "TREEVIEW"}} {{#eq controlType "TREEVIEW"}}
<{{codeName}}Tree <{{codeName}}Tree
ref="xData" ref="xData"
name="{{name}}"
:context="state.context" :context="state.context"
:viewParams="state.viewParams" :viewParams="state.viewParams"
:viewSubject="state.viewSubject" :viewSubject="state.viewSubject"
...@@ -72,8 +72,8 @@ defineExpose({ name, state }); ...@@ -72,8 +72,8 @@ defineExpose({ name, state });
v-if="state.selection.viewName && state.selection.viewName === '{{viewRef.refPSAppView.name}}'" v-if="state.selection.viewName && state.selection.viewName === '{{viewRef.refPSAppView.name}}'"
class="tree-exp__nav-view" class="tree-exp__nav-view"
:viewDefaultUsage="false" :viewDefaultUsage="false"
:viewdata="JSON.stringify(state.selection.context)" :context="state.selection.context"
:viewParams="JSON.stringify(state.selection.viewParams)"> :viewParams="state.selection.viewParams">
</{{viewRef.refPSAppView.name}}> </{{viewRef.refPSAppView.name}}>
{{/if}} {{/if}}
{{/each}} {{/each}}
......
...@@ -6,7 +6,7 @@ import { ctrlState } from './{{spinalCase ctrl.codeName}}-tree-state'; ...@@ -6,7 +6,7 @@ import { ctrlState } from './{{spinalCase ctrl.codeName}}-tree-state';
interface Props { interface Props {
name:string, name:string,
context: IContext; context: IContext;
selectedData: IParam[]; selectedData?: IParam[];
selectFirstDefault?: boolean; selectFirstDefault?: boolean;
isBranchAvailable?: boolean; isBranchAvailable?: boolean;
viewParams?: IParam; viewParams?: IParam;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册