提交 d0b5a968 编写于 作者: ibizdev's avatar ibizdev

xignzi006 发布系统代码

上级 cef9606d
......@@ -3408,6 +3408,33 @@
}
]
},
{
"srfkey": "Knowledgearticleincident__StateCode",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "1",
"label": "停用",
"text": "停用",
"data":"",
"codename":"Item_1",
"value": "1",
"disabled": false
}
, {
"id": "0",
"label": "有效",
"text": "有效",
"data":"",
"codename":"Item_0",
"value": "0",
"disabled": false
}
]
},
{
"srfkey": "Goal__FiscalPeriod",
"emptytext": "未定义",
......
......@@ -6,9 +6,15 @@
:count="item.counterService.counterData[item.counterId]"
type="info"
>
<i-button type="text" ghost @click="handleClick(item.viewlogicname)">{{item.actionName}}</i-button>
<i-button type="text" ghost @click="handleClick(item.viewlogicname)">
<i v-if="item.iconcls != ''" :class="item.iconcls" />
{{item.text}}
</i-button>
</Badge>
<i-button v-else type="text" ghost @click="handleClick(item.viewlogicname)">{{item.actionName}}</i-button>
<i-button v-else type="text" ghost @click="handleClick(item.viewlogicname)">
<i v-if="item.iconcls != ''" :class="item.iconcls" />
{{item.text}}
</i-button>
</div>
</div>
</template>
......@@ -33,6 +39,7 @@ export default class AppActionBar extends Vue {
* @memberof AppActionBar
*/
public handleClick($event: any) {
console.log(this.items);
this.$emit("itemClick", $event);
}
}
......
......@@ -441,6 +441,11 @@ export default {
"2": "难题",
"empty": ""
},
Knowledgearticleincident__StateCode: {
"1": "停用",
"0": "有效",
"empty": ""
},
Goal__FiscalPeriod: {
"1": "1 季度",
"2": "2 季度",
......
......@@ -441,6 +441,11 @@ export default {
"2": "难题",
"empty": "",
},
Knowledgearticleincident__StateCode: {
"1": "停用",
"0": "有效",
"empty": "",
},
Goal__FiscalPeriod: {
"1": "1 季度",
"2": "2 季度",
......
......@@ -41,6 +41,7 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "KnowledgeArticle 事件",
srfmajortext: "状态",
srftempmode: "",
srfuf: "",
srfdeid: "",
......
......@@ -40,6 +40,7 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "KnowledgeArticle 事件",
srfmajortext: "状态",
srftempmode: "",
srfuf: "",
srfdeid: "",
......
......@@ -44,6 +44,7 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "产品关联 ID",
srfmajortext: "产品名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
......
......@@ -43,6 +43,7 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "产品关联 ID",
srfmajortext: "产品名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
......
......@@ -56,6 +56,7 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "产品价目表",
srfmajortext: "产品名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
......
......@@ -55,6 +55,7 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "产品价目表",
srfmajortext: "产品名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
......
......@@ -3416,6 +3416,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
},
]
},
{
srfkey: "Knowledgearticleincident__StateCode",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "1",
label: "停用",
text: "停用",
"data":"",
"codename":"Item_1",
value: "1",
disabled: false,
},
{
id: "0",
label: "有效",
text: "有效",
"data":"",
"codename":"Item_0",
value: "0",
disabled: false,
},
]
},
{
srfkey: "Goal__FiscalPeriod",
emptytext: "未定义",
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -3,7 +3,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -30,7 +30,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -3,7 +3,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -6,7 +6,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -5,7 +5,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -6,7 +6,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -102,6 +102,7 @@ export class ProductAssociationEditViewBase extends EditViewBase {
form: this.$refs.form,
p2k: '0',
keyPSDEField: 'productassociation',
majorPSDEField: 'productname',
isLoadDefault: true,
});
}
......
......@@ -122,6 +122,7 @@ export class ProductAssociationGridViewBase extends GridViewBase {
grid: this.$refs.grid,
searchform: this.$refs.searchform,
keyPSDEField: 'productassociation',
majorPSDEField: 'productname',
isLoadDefault: true,
});
}
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -102,6 +102,7 @@ export class ProductPriceLevelProPrilvEditViewBase extends EditViewBase {
form: this.$refs.form,
p2k: '0',
keyPSDEField: 'productpricelevel',
majorPSDEField: 'productname',
isLoadDefault: true,
});
}
......
......@@ -122,6 +122,7 @@ export class ProductPriceLevelProPrilvGridViewBase extends GridViewBase {
grid: this.$refs.grid,
searchform: this.$refs.searchform,
keyPSDEField: 'productpricelevel',
majorPSDEField: 'productname',
isLoadDefault: true,
});
}
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -21,7 +21,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
......
......@@ -24,7 +24,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -27,7 +27,7 @@
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isSingleSelect"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
......
......@@ -31,7 +31,7 @@ export default class KnowledgeArticleIncidentServiceBase extends EntityService {
this.APPLYDEKEY ='knowledgearticleincident';
this.APPDEKEY = 'knowledgearticleincidentid';
this.APPDENAME = 'knowledgearticleincidents';
this.APPDETEXT = '';
this.APPDETEXT = 'statecode';
this.APPNAME = 'crm';
this.SYSTEMNAME = 'ibizbusinesscentral';
}
......
......@@ -31,7 +31,7 @@ export default class ProductAssociationServiceBase extends EntityService {
this.APPLYDEKEY ='productassociation';
this.APPDEKEY = 'productassociationid';
this.APPDENAME = 'productassociations';
this.APPDETEXT = '';
this.APPDETEXT = 'productname';
this.APPNAME = 'crm';
this.SYSTEMNAME = 'ibizbusinesscentral';
}
......
......@@ -31,7 +31,7 @@ export default class ProductPriceLevelServiceBase extends EntityService {
this.APPLYDEKEY ='productpricelevel';
this.APPDEKEY = 'productpricelevelid';
this.APPDENAME = 'productpricelevels';
this.APPDETEXT = '';
this.APPDETEXT = 'productname';
this.APPNAME = 'crm';
this.SYSTEMNAME = 'ibizbusinesscentral';
}
......
import { PropOptions } from 'vue';
import { Constructor } from 'vue/types/options';
/**
* Vue多层继承生命周期处理装饰器
*
......@@ -13,12 +16,12 @@ export function VueLifeCycleProcessing(params?: any): any {
// 原型
const p = constructor.prototype;
// 方法名数组
const methodNames: string[] = ['beforeCreate', 'created', 'beforeMount', 'mounted', 'beforeUpdate', 'updated', 'activated', 'deactivated', 'beforeDestroy', 'destroyed', 'errorCaptured'];
const methodNames: string[] = ['beforeCreate', 'beforeMount', 'mounted', 'beforeUpdate', 'updated', 'activated', 'deactivated', 'beforeDestroy', 'destroyed', 'errorCaptured'];
methodNames.forEach((name: string) => {
if (!p.hasOwnProperty(name) && p[name]) {
p[name] = function () {
if (this[name]) {
this[name]();
this[name].apply(this, arguments);
}
}
}
......@@ -30,6 +33,31 @@ export function VueLifeCycleProcessing(params?: any): any {
}
}
}
// 替换原生Prop注解
// if (p.___vuePropArr && p.___vuePropArr.length > 0) {
// const arr: any[] = JSON.parse(JSON.stringify(p.___vuePropArr));
// delete p.___vuePropArr;
// const fun = p['beforeCreate'];
// p['beforeCreate'] = function() {
// const props = this.$options.props || {};
// arr.forEach((item: any) => {
// props[item.key] = item.params || {};
// });
// console.log(props);
// this.$options.props = props;
// if (fun) {
// fun.apply(this, arguments);
// }
// }
// } else if (!p.hasOwnProperty('beforeCreate') && p['beforeCreate']) {
// p['beforeCreate'] = function () {
// if (this['beforeCreate']) {
// this['beforeCreate'].apply(this, arguments);
// }
// }
// }
// 替换原生Watch注解
if (p.___vueWatchArr && p.___vueWatchArr.length > 0) {
const arr: any[] = JSON.parse(JSON.stringify(p.___vueWatchArr));
......@@ -45,6 +73,12 @@ export function VueLifeCycleProcessing(params?: any): any {
fun.apply(this, arguments);
}
}
} else if (!p.hasOwnProperty('created') && p['created']) {
p['created'] = function () {
if (this['created']) {
this['created'].apply(this, arguments);
}
}
}
}
}
......@@ -68,4 +102,24 @@ export function Watch(key: string, params?: { deep?: boolean, immediate?: boolea
params
});
};
}
\ No newline at end of file
}
/**
* 企划Vue自身Prop注解,实现在继承时不出问题
*
* @export
* @param {string} key 输入属性key
* @param {(PropOptions | Constructor[] | Constructor)} [options] 参数
* @returns {*}
*/
// export function Prop(options?: PropOptions | Constructor[] | Constructor): any {
// return function (p: any, key: any) {
// if (!p.___vuePropArr) {
// p.___vuePropArr = [];
// }
// p.___vuePropArr.push({
// key,
// options
// });
// };
// }
\ No newline at end of file
......@@ -69,6 +69,7 @@ import { UserInfo } from './components/user-info/user-info';
import { StudioViewStyle2 } from './components/studio-view-style2/studio-view-style2';
import { StudioView } from './components/studio-view/studio-view';
import { StudioEmbedView } from './components/studio-embed-view/studio-embed-view';
import { StudioEmbedViewStyle2 } from './components/studio-embed-view-style2/studio-embed-view-style2';
import { ViewToolbar } from './components/view-toolbar/view-toolbar';
import { ViewConfigActions } from './components/view-config-actions/view-config-actions';
import HtmlContainer from './components/html-container/html-container.vue';
......@@ -103,6 +104,7 @@ export const StudioCore = {
v.component('studio-view-style2', StudioViewStyle2);
v.component('studio-view', StudioView);
v.component('studio-embed-view', StudioEmbedView);
v.component('studio-embed-view-style2', StudioEmbedViewStyle2);
v.component('view-toolbar', ViewToolbar);
v.component('view-config-actions', ViewConfigActions);
v.component('html-container', HtmlContainer);
......
......@@ -22,6 +22,15 @@ export class GridViewBase extends MDViewBase {
*/
protected gridRowActiveMode: 0 | 1 | 2 = 2;
/**
* 是否单选
*
* @readonly
* @type {boolean}
* @memberof GridViewBase
*/
protected isGridSingleSelect: boolean = false;
/**
* 刷新数据
*
......
......@@ -29,16 +29,6 @@ export class MDViewBase extends ViewBase {
@Prop({ default: false })
protected isformDruipart?: boolean;
/**
* 是否单选
*
* @readonly
* @type {boolean}
* @memberof MDViewBase
*/
@Prop({ default: false })
protected isSingleSelect!: boolean;
/**
* 是否展开搜索表单
*
......
......@@ -19,4 +19,14 @@ export class PickupGridViewBase extends GridView9Base {
@Prop()
public selectedData?: string;
/**
* 是否单选
*
* @readonly
* @type {boolean}
* @memberof MDViewBase
*/
@Prop({ default: false })
protected isSingleSelect!: boolean;
}
\ No newline at end of file
......@@ -165,11 +165,9 @@ export class EditFormControlBase extends FormControlBase {
* @memberof EditFormControlBase
*/
public onFormLoad(data: any = {}, action: string): void {
if (Object.is(action, "save") || Object.is(action, "autoSave") || Object.is(action, "submit")) {
// 更新context的实体主键
if (data[this.appDeName]) {
Object.assign(this.context, { [this.appDeName]: data[this.appDeName] })
}
// 更新context的实体主键
if (data[this.appDeName]) {
Object.assign(this.context, { [this.appDeName]: data[this.appDeName] })
}
this.setFormEnableCond(data);
this.fillForm(data, action);
......
......@@ -50,6 +50,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfupdatedate: null,
srforikey: null,
srfkey: null,
srfmajortext: null,
srftempmode: null,
srfuf: null,
srfdeid: null,
......@@ -94,6 +95,8 @@ export class MainEditFormBase extends EditFormControlBase {
srfkey: new FormItemModel({ caption: '产品关联 ID', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
srfmajortext: new FormItemModel({ caption: '产品名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
......
......@@ -38,6 +38,11 @@ export default class MainModel {
prop: 'productassociationid',
dataType: 'GUID',
},
{
name: 'srfmajortext',
prop: 'productname',
dataType: 'PICKUPTEXT',
},
{
name: 'srftempmode',
},
......
......@@ -61,6 +61,11 @@ export default class MainModel {
prop: 'uomname',
dataType: 'PICKUPTEXT',
},
{
name: 'srfmajortext',
prop: 'productname',
dataType: 'PICKUPTEXT',
},
{
name: 'srfdataaccaction',
prop: 'productassociationid',
......
......@@ -26,29 +26,19 @@ export default class MainModel {
]
}else{
return [
{
name: 'amount',
prop: 'amount',
dataType: 'BIGDECIMAL',
},
{
name: 'pricingmethodcode',
prop: 'pricingmethodcode',
dataType: 'SSCODELIST',
},
{
name: 'uomscheduleid',
prop: 'uomscheduleid',
dataType: 'PICKUP',
},
{
name: 'pricelevelname',
prop: 'pricelevelname',
dataType: 'PICKUPTEXT',
},
{
name: 'productid',
prop: 'productid',
name: 'uomscheduleid',
prop: 'uomscheduleid',
dataType: 'PICKUP',
},
{
......@@ -56,25 +46,20 @@ export default class MainModel {
prop: 'transactioncurrencyid',
dataType: 'PICKUP',
},
{
name: 'uomid',
prop: 'uomid',
dataType: 'PICKUP',
},
{
name: 'uomname',
prop: 'uomname',
dataType: 'PICKUPTEXT',
},
{
name: 'discounttypeid',
prop: 'discounttypeid',
dataType: 'PICKUP',
name: 'srfmajortext',
prop: 'productname',
dataType: 'PICKUPTEXT',
},
{
name: 'pricelevelid',
prop: 'pricelevelid',
dataType: 'PICKUP',
name: 'srfkey',
prop: 'productpricelevelid',
dataType: 'GUID',
},
{
name: 'srfdataaccaction',
......@@ -82,9 +67,29 @@ export default class MainModel {
dataType: 'GUID',
},
{
name: 'srfkey',
prop: 'productpricelevelid',
dataType: 'GUID',
name: 'amount',
prop: 'amount',
dataType: 'BIGDECIMAL',
},
{
name: 'productid',
prop: 'productid',
dataType: 'PICKUP',
},
{
name: 'uomid',
prop: 'uomid',
dataType: 'PICKUP',
},
{
name: 'discounttypeid',
prop: 'discounttypeid',
dataType: 'PICKUP',
},
{
name: 'pricelevelid',
prop: 'pricelevelid',
dataType: 'PICKUP',
},
{
name: 'productpricelevel',
......
......@@ -50,6 +50,7 @@ export class ProPrilvEditFormBase extends EditFormControlBase {
srfupdatedate: null,
srforikey: null,
srfkey: null,
srfmajortext: null,
srftempmode: null,
srfuf: null,
srfdeid: null,
......@@ -109,6 +110,8 @@ export class ProPrilvEditFormBase extends EditFormControlBase {
srfkey: new FormItemModel({ caption: '产品价目表', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
srfmajortext: new FormItemModel({ caption: '产品名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
......
......@@ -38,6 +38,11 @@ export default class ProPrilvModel {
prop: 'productpricelevelid',
dataType: 'GUID',
},
{
name: 'srfmajortext',
prop: 'productname',
dataType: 'PICKUPTEXT',
},
{
name: 'srftempmode',
},
......
......@@ -49,6 +49,9 @@ public class AuditSearchContext extends QueryWrapperContext<Audit> {
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("action", query)
);
}
}
}
......
......@@ -63,6 +63,9 @@ public class KnowledgeArticleViewsSearchContext extends QueryWrapperContext<Know
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("statecode", query)
);
}
}
}
......
......@@ -42,6 +42,9 @@ public class SiteMapSearchContext extends QueryWrapperContext<SiteMap> {
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("sitemapname", query)
);
}
}
}
......
......@@ -49,6 +49,9 @@ public class SlaItemSearchContext extends QueryWrapperContext<SlaItem> {
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("name", query)
);
}
}
}
......
......@@ -42,6 +42,9 @@ public class AnnualFiscalCalendarSearchContext extends QueryWrapperContext<Annua
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("salespersonidyominame", query)
);
}
}
}
......
......@@ -42,6 +42,9 @@ public class FixedMonthlyFiscalCalendarSearchContext extends QueryWrapperContext
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("salespersonidyominame", query)
);
}
}
}
......
......@@ -42,6 +42,9 @@ public class MonthlyFiscalCalendarSearchContext extends QueryWrapperContext<Mont
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("salespersonidyominame", query)
);
}
}
}
......
......@@ -42,6 +42,9 @@ public class QuarterlyFiscalCalendarSearchContext extends QueryWrapperContext<Qu
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("salespersonidyominame", query)
);
}
}
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册