lab_gzf 部署微服务应用

app_AssetManagement/public/assets/json/view-config.json

@@ -100,7 +100,7 @@
         "memo": ""
     },
     "eamasseteditview": {
-        "title": "资产编辑视图",
+        "title": "资产信息编辑",
         "caption": "资产",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "Asset",

app_AssetManagement/src/locale/lanres/entities/eamasset/eamasset_en_US.ts

@@ -24,7 +24,7 @@ export default {
 		},
 		editview: {
 			caption: "资产",
-      		title: "资产编辑视图",
+      		title: "资产信息编辑",
 		},
 		summaryview: {
 			caption: "资产",
@@ -112,10 +112,8 @@ export default {
 	},
 	main_form: {
 		details: {
-			group1: "资产基本信息", 
+			group1: "基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "资产标识", 
@@ -124,6 +122,16 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			assetnumber: "资产编号", 
+			assetname: "资产名称", 
+			eamassettypename: "资产类型", 
+			eamlocationname: "功能位置", 
+			passetname: "上级资产", 
+			eamassetstatename: "资产状态", 
+			eamlocationid: "功能位置标识", 
+			eamassettypeid: "资产类型标识", 
+			eamassetstateid: "资产状态标识", 
+			passetid: "上级资产标识", 
 			assetid: "资产标识", 
 		},
 		uiactions: {
@@ -268,6 +276,28 @@ export default {
 			tip: "关闭",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openmaineditview: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	locationassetgridviewtoolbar_toolbar: {
 		tbitem5: {
 			caption: "New",

app_AssetManagement/src/locale/lanres/entities/eamasset/eamasset_zh_CN.ts

@@ -23,7 +23,7 @@ export default {
 		},
 		editview: {
 			caption: "资产",
-      		title: "资产编辑视图",
+      		title: "资产信息编辑",
 		},
 		summaryview: {
 			caption: "资产",
@@ -111,10 +111,8 @@ export default {
 	},
 	main_form: {
 		details: {
-			group1: "资产基本信息", 
+			group1: "基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "资产标识", 
@@ -123,6 +121,16 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			assetnumber: "资产编号", 
+			assetname: "资产名称", 
+			eamassettypename: "资产类型", 
+			eamlocationname: "功能位置", 
+			passetname: "上级资产", 
+			eamassetstatename: "资产状态", 
+			eamlocationid: "功能位置标识", 
+			eamassettypeid: "资产类型标识", 
+			eamassetstateid: "资产状态标识", 
+			passetid: "上级资产标识", 
 			assetid: "资产标识", 
 		},
 		uiactions: {
@@ -267,6 +275,28 @@ export default {
 			tip: "关闭",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openmaineditview: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	locationassetgridviewtoolbar_toolbar: {
 		tbitem5: {
 			caption: "新建",

app_AssetManagement/src/mock/viewconfig/viewconfig.ts

@@ -88,7 +88,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "30027967566375f388f110149cf48b49"
         },
         "eamasseteditview": {
-            "title": "资产编辑视图",
+            "title": "资产信息编辑",
             "caption": "资产",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "Asset",

app_AssetManagement/src/pages/asset/eamasset-edit-view/eamasset-edit-view-base.tsx

@@ -6,7 +6,7 @@ import EditViewEngine from '@engine/view/edit-view-engine';
 import EAMAssetUIService from '@/uiservice/eamasset/eamasset-ui-service';
 
 /**
- * 资产编辑视图视图基类
+ * 资产信息编辑视图基类
  *
  * @export
  * @class EAMAssetEditViewBase

app_AssetManagement/src/pages/asset/eamasset-edit-view/eamasset-edit-view.html

-<studio-view-style2 viewName="eamasseteditview" viewTitle="资产编辑视图" class='deeditview eamasset-edit-view'>
+<studio-view-style2 viewName="eamasseteditview" viewTitle="资产信息编辑" class='deeditview eamasset-edit-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_AssetManagement/src/pages/asset/eamasset-edit-view/eamasset-edit-view.vue

@@ -6,7 +6,7 @@ import { EAMAssetEditViewBase } from './eamasset-edit-view-base';
 import view_form from '@widgets/eamasset/main-form/main-form.vue';
 
 /**
- * 资产编辑视图视图
+ * 资产信息编辑视图
  *
  * @export
  * @class EAMAssetEditView

app_AssetManagement/src/pages/asset/eamasset-info-view/eamasset-info-view-base.tsx

@@ -88,9 +88,28 @@ export class EAMAssetInfoViewBase extends TabExpViewBase {
      * @memberof EAMAssetInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMAssetInfoView
+     */
+    public toolBarModels: any = {
+        tbitem15_openmaineditview: { name: 'tbitem15_openmaineditview', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenMainEditView', target: 'SINGLEKEY', class: '' } },
+
+        tbitem15_remove_sep: {  name: 'tbitem15_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem15_remove: { name: 'tbitem15_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
+
+        tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -126,5 +145,125 @@ export class EAMAssetInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMAssetInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem15_openmaineditview')) {
+            this.toolbar_tbitem15_openmaineditview_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem15_remove')) {
+            this.toolbar_tbitem15_remove_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_openmaineditview_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMAssetUIService  = new EAMAssetUIService();
+        curUIService.EAMAsset_OpenMainEditView(datas,contextJO, paramJO,  $event, xData,this,"EAMAsset");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_remove_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMAssetUIService  = new EAMAssetUIService();
+        curUIService.EAMAsset_Remove(datas,contextJO, paramJO,  $event, xData,this,"EAMAsset");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"EAMAsset");
+    }
+
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMAssetInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 }
\ No newline at end of file

app_AssetManagement/src/pages/asset/eamasset-info-view/eamasset-info-view.html

@@ -2,6 +2,8 @@
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_AssetManagement/src/store/modules/view-action/state.ts

@@ -114,6 +114,10 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '906130a9861c2b0cff3173c9e171c1d1',
+                '72c39b4fb4834276ae3933be232a2c90',
+                'ddfe97780b64a25b28b14a283fa27a61',
+                '2b28313d0f3925fa44b8683eb5ea54d6',
             ],
         },
         {
@@ -191,6 +195,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '3bac4846ece1082b8c3799d9a1fc7dde',
                 '4db903dc10459c98d4834775020d8b74',
                 'c8bf8b682adc459f7f285328199ba4b4',
             ],

app_AssetManagement/src/uiservice/eamasset/eamasset-ui-service-base.ts

@@ -118,6 +118,131 @@ export default class EAMAssetUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMAsset_OpenMainEditView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamasset: '%eamasset%' });
+        Object.assign(params, { assetid: '%eamasset%' });
+        Object.assign(params, { assetname: '%assetname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        if(context.eamlocation && true){
+            deResParameters = [
+            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'eamassets', parameterName: 'eamasset' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+            actionContext.closeView(null);
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            if (xData && xData.refresh && xData.refresh instanceof Function) {
+                xData.refresh(args);
+            }
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMAsset_Remove(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamasset: '%eamasset%' });
+        Object.assign(params, { assetid: '%eamasset%' });
+        Object.assign(params, { assetname: '%assetname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        // 直接调实体服务需要转换的数据
+        if(context && context.srfsessionid){
+          context.srfsessionkey = context.srfsessionid;
+            delete context.srfsessionid;
+        }
+              actionContext.closeView(null);
+        const backend = () => {
+            const curService:EAMAssetService =  new EAMAssetService();
+            curService.Remove(context,data, true).then((response: any) => {
+                if (!response || response.status !== 200) {
+                    actionContext.$Notice.error({ title: '错误', desc: response.message });
+                    return;
+                }
+                actionContext.$Notice.success({ title: '成功', desc: '删除并关闭成功！' });
+
+                const _this: any = actionContext;
+                if (xData && xData.refresh && xData.refresh instanceof Function) {
+                    xData.refresh(args);
+                }
+                return response;
+            }).catch((response: any) => {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                    return;
+                }
+                if (response.status === 401) {
+                    return;
+                }
+                return response;
+            });
+        };
+        backend();
+    }
+
     /**
      * 打开主信息界面
      *

app_AssetManagement/src/widgets/eamasset/main-form/main-form-base.tsx

@@ -74,6 +74,16 @@ export class MainEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
+        assetnumber: null,
+        assetname: null,
+        eamassettypename: null,
+        eamlocationname: null,
+        passetname: null,
+        eamassetstatename: null,
+        eamlocationid: null,
+        eamassettypeid: null,
+        eamassetstateid: null,
+        passetid: null,
         assetid: null,
         eamasset:null,
     };
@@ -85,6 +95,14 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
+        assetnumber: [
+            { required: true, type: 'string', message: '资产编号 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '资产编号 值不能为空', trigger: 'blur' },
+        ],
+        assetname: [
+            { required: true, type: 'string', message: '资产名称 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '资产名称 值不能为空', trigger: 'blur' },
+        ],
     }
 
     /**
@@ -94,14 +112,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '资产基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamasset.main_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamasset.main_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
-        group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamasset.main_form', extractMode: 'ITEM', details: [] } }),
-
-        formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
-
         srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -118,8 +132,27 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        assetnumber: new FormItemModel({ caption: '资产编号', detailType: 'FORMITEM', name: 'assetnumber', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        assetname: new FormItemModel({ caption: '资产名称', detailType: 'FORMITEM', name: 'assetname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamassettypename: new FormItemModel({ caption: '资产类型', detailType: 'FORMITEM', name: 'eamassettypename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamlocationname: new FormItemModel({ caption: '功能位置', detailType: 'FORMITEM', name: 'eamlocationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        passetname: new FormItemModel({ caption: '上级资产', detailType: 'FORMITEM', name: 'passetname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamassetstatename: new FormItemModel({ caption: '资产状态', detailType: 'FORMITEM', name: 'eamassetstatename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamassettypeid: new FormItemModel({ caption: '资产类型标识', detailType: 'FORMITEM', name: 'eamassettypeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamassetstateid: new FormItemModel({ caption: '资产状态标识', detailType: 'FORMITEM', name: 'eamassetstateid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        passetid: new FormItemModel({ caption: '上级资产标识', detailType: 'FORMITEM', name: 'passetid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         assetid: new FormItemModel({ caption: '资产标识', detailType: 'FORMITEM', name: 'assetid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 }
\ No newline at end of file

app_AssetManagement/src/widgets/eamasset/main-form/main-form-model.ts

@@ -55,6 +55,56 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
+      {
+        name: 'assetnumber',
+        prop: 'assetnumber',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'assetname',
+        prop: 'assetname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'eamassettypename',
+        prop: 'eamassettypename',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'eamlocationname',
+        prop: 'eamlocationname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'passetname',
+        prop: 'passetname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'eamassetstatename',
+        prop: 'eamassetstatename',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'eamlocationid',
+        prop: 'eamlocationid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'eamassettypeid',
+        prop: 'eamassettypeid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'eamassetstateid',
+        prop: 'eamassetstateid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'passetid',
+        prop: 'passetid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'assetid',
         prop: 'assetid',

app_AssetManagement/src/widgets/eamasset/main-form/main-form-service.ts

@@ -2,6 +2,9 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import EAMAssetService from '@/service/eamasset/eamasset-service';
 import MainModel from './main-form-model';
+import EAMAssetTypeService from '@/service/eamasset-type/eamasset-type-service';
+import EAMLocationService from '@/service/eamlocation/eamlocation-service';
+import EAMAssetStateService from '@/service/eamasset-state/eamasset-state-service';
 
 
 /**
@@ -41,6 +44,30 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 资产类型服务对象
+     *
+     * @type {EAMAssetTypeService}
+     * @memberof MainService
+     */
+    public eamassettypeService: EAMAssetTypeService = new EAMAssetTypeService();
+
+    /**
+     * 功能位置服务对象
+     *
+     * @type {EAMLocationService}
+     * @memberof MainService
+     */
+    public eamlocationService: EAMLocationService = new EAMLocationService();
+
+    /**
+     * 资产状态服务对象
+     *
+     * @type {EAMAssetStateService}
+     * @memberof MainService
+     */
+    public eamassetstateService: EAMAssetStateService = new EAMAssetStateService();
+
     /**
      * 处理数据
      *
@@ -80,6 +107,18 @@ export default class MainService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'EAMAssetTypeService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.eamassettypeService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'eamassettypeid', 'eamassettype');
+        }
+        if (Object.is(serviceName, 'EAMLocationService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.eamlocationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'eamlocationid', 'eamlocation');
+        }
+        if (Object.is(serviceName, 'EAMAssetService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.appEntityService.FetchDefault(JSON.parse(JSON.stringify(context)), data, isloading), 'assetid', 'eamasset');
+        }
+        if (Object.is(serviceName, 'EAMAssetStateService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.eamassetstateService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'eamassetstateid', 'eamassetstate');
+        }
 
         return Promise.reject([])
     }

app_AssetManagement/src/widgets/eamasset/main-form/main-form.html

 <i-form :model="this.data" class='app-form' ref='form'  id='eamasset_main' style="">
     <input style="display:none;" />
     <row >
-    <tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage" 
-        @on-click="detailsModel.form.clickPage($event)">
-            <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.eamasset.main_form.details.formpage1')
-                    ])
-                }">
-                    
+            
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamasset.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
-            
-    </row>
-</app-form-group>
+        <i-col class="form-layout-container" v-show="detailsModel.assetnumber.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='assetnumber' :itemRules="this.rules.assetnumber" class='' :caption="$t('entities.eamasset.main_form.details.assetnumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.assetnumber.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.assetnumber"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.assetnumber.disabled" type='text'  style=""></input-box>
+</app-form-item>
 
 </i-col>
+<i-col class="form-layout-container" v-show="detailsModel.assetname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='assetname' :itemRules="this.rules.assetname" class='' :caption="$t('entities.eamasset.main_form.details.assetname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.assetname.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.assetname"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.assetname.disabled" type='text'  style=""></input-box>
+</app-form-item>
 
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.eamassettypename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='eamassettypename' :itemRules="this.rules.eamassettypename" class='' :caption="$t('entities.eamasset.main_form.details.eamassettypename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamassettypename.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.eamassettypename.disabled"
+  name='eamassettypename'
+  deMajorField='eamassettypename'
+  deKeyField='eamassettype'
+  :service="service"
+  :acParams="{ serviceName: 'EAMAssetTypeService', interfaceName: 'FetchDefault'}"
+  valueitem='eamassettypeid' 
+  :value="data.eamassettypename"
+  :pickupView="{ viewname: 'eamasset-type-pickup-view', title: $t('entities.eamassettype.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamassettypes', parameterName: 'eamassettype' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
 
-            </tab-pane> 
-            <tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.eamasset.main_form.details.formpage2')
-                    ])
-                }">
-                    
-<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamasset.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
-    <row>
-            
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.eamlocationname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='eamlocationname' :itemRules="this.rules.eamlocationname" class='' :caption="$t('entities.eamasset.main_form.details.eamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.eamlocationname.disabled"
+  name='eamlocationname'
+  deMajorField='eamlocationname'
+  deKeyField='eamlocation'
+  :service="service"
+  :acParams="{ serviceName: 'EAMLocationService', interfaceName: 'FetchDefault'}"
+  valueitem='eamlocationid' 
+  :value="data.eamlocationname"
+  :pickupView="{ viewname: 'eamlocation-pickup-view', title: $t('entities.eamlocation.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocations', parameterName: 'eamlocation' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.passetname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='passetname' :itemRules="this.rules.passetname" class='' :caption="$t('entities.eamasset.main_form.details.passetname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.passetname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.passetname.disabled"
+  name='passetname'
+  deMajorField='assetname'
+  deKeyField='eamasset'
+  :service="service"
+  :acParams="{ serviceName: 'EAMAssetService', interfaceName: 'FetchDefault'}"
+  valueitem='passetid' 
+  :value="data.passetname"
+  :pickupView="{ viewname: 'eamasset-pickup-view', title: $t('entities.eamasset.views.pickupview.title'), deResParameters: [{ pathName: 'eamlocations', parameterName: 'eamlocation' }, ], parameters: [{ pathName: 'eamassets', parameterName: 'eamasset' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.eamassetstatename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='eamassetstatename' :itemRules="this.rules.eamassetstatename" class='' :caption="$t('entities.eamasset.main_form.details.eamassetstatename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamassetstatename.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.eamassetstatename.disabled"
+  name='eamassetstatename'
+  deMajorField='eamassetstatename'
+  deKeyField='eamassetstate'
+  :service="service"
+  :acParams="{ serviceName: 'EAMAssetStateService', interfaceName: 'FetchDefault'}"
+  valueitem='eamassetstateid' 
+  :value="data.eamassetstatename"
+  :pickupView="{ viewname: 'eamasset-state-pickup-view', title: $t('entities.eamassetstate.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamassetstates', parameterName: 'eamassetstate' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+    
     </row>
 </app-form-group>
 
 </i-col>
 
 
-            </tab-pane> 
-    </tabs>
     </row>
 </i-form>
\ No newline at end of file

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-app-assetmanagement.jar
 
-EXPOSE 8080
+EXPOSE 10325
 
 ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml

@@ -3,9 +3,25 @@ services:
   assetmanagement-app-assetmanagement:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
     ports:
-      - "8080:8080"
+      - "10325:10325"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10325
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

assetmanagement-core/src/main/resources/liquibase/h2_table.xml

@@ -116,7 +116,7 @@
 
 
     <!--输出实体[EAMASSET]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamasset-69-6">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamasset-79-6">
         <createTable tableName="ASSET">
                 <column name="ASSETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMASSET_ASSETID"/>
@@ -581,16 +581,16 @@
        <addForeignKeyConstraint baseColumnNames="EAMAPPLYSTATEMODELID" baseTableName="EAMAPPLYTYPE" constraintName="DER1N_EAMAPPLYTYPE_EAMAPPLYSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMAPPLYSTATEMODELID" referencedTableName="EAMAPPLYSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMASSET]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-69-31">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-79-31">
        <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSETSTATE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEID" referencedTableName="EAMASSETSTATE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-69-32">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-79-32">
        <addForeignKeyConstraint baseColumnNames="EAMASSETTYPEID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSETTYPE_EA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETTYPEID" referencedTableName="EAMASSETTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-69-33">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-79-33">
        <addForeignKeyConstraint baseColumnNames="PASSETID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSET_PASSET" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-69-34">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-79-34">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMLOCATION_EAM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMASSETSTATE]外键关系 -->

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-provider-assetapi.jar
 
-EXPOSE 10315
+EXPOSE 8081
 
 ADD assetmanagement-provider-assetapi.jar /assetmanagement-provider-assetapi.jar

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/assetmanagement-provider-assetapi.yaml

@@ -3,25 +3,9 @@ services:
   assetmanagement-provider-assetapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-provider-assetapi:latest
     ports:
-      - "10315:10315"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10315
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizassetmanagement/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizassetmanagement/
-      mvn clean package -Passetapi
-      cd assetmanagement-provider/assetmanagement-provider-assetapi
-      mvn -Passetapi docker:build
-      mvn -Passetapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-provider-assetapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Passetmanagement
+      cd assetmanagement-app/assetmanagement-app-assetmanagement
+      mvn -Passetmanagement docker:build
+      mvn -Passetmanagement docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>