Merge remote-tracking branch 'origin/master'

app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US_base.ts

@@ -166,6 +166,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
+			tbitem1_initmodels: {
+				caption: commonLogic.appcommonhandle("初始化模型",null),
+				tip: commonLogic.appcommonhandle("初始化模型",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("New",null),
 				tip: commonLogic.appcommonhandle("New",null),

app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN_base.ts

@@ -166,6 +166,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
+			tbitem1_initmodels: {
+				caption: commonLogic.appcommonhandle("初始化模型",null),
+				tip: commonLogic.appcommonhandle("初始化模型",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
 				tip: commonLogic.appcommonhandle("新建",null),

app_web/src/pages/lite/meta-entity-grid-view/meta-entity-grid-view-base.vue

@@ -12,6 +12,14 @@
                 <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;padding-left: 24px' placeholder="实体名" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
+                        <tooltip :transfer="true" :max-width="600">
+                                <i-button v-show="toolBarModels.tbitem1_initmodels.visabled" :disabled="toolBarModels.tbitem1_initmodels.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_initmodels' }, $event)">
+                                    <i class=''></i>
+                                    <span class='caption'>{{$t('entities.metaentity.gridviewtoolbar_toolbar.tbitem1_initmodels.caption')}}</span>
+                                </i-button>
+                            <div slot='content'>{{$t('entities.metaentity.gridviewtoolbar_toolbar.tbitem1_initmodels.tip')}}</div>
+                        </tooltip>
+                        <span class='seperator'>|</span>
                         <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">
                                     <i class='fa fa-file-text-o'></i>
@@ -369,6 +377,9 @@ export default class MetaEntityGridViewBase extends Vue {
      * @memberof MetaEntityGridView
      */
     public toolBarModels: any = {
+        tbitem1_initmodels: { name: 'tbitem1_initmodels', actiontarget: 'NONE', caption: '初始化模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'initModels', target: 'SINGLEDATA' } },
+
+        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
@@ -744,6 +755,9 @@ export default class MetaEntityGridViewBase extends Vue {
      * @memberof MetaEntityGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem1_initmodels')) {
+            this.toolbar_tbitem1_initmodels_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -886,6 +900,35 @@ export default class MetaEntityGridViewBase extends Vue {
 
 
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_initmodels_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 = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:MetaEntityUIService  = new MetaEntityUIService();
+        curUIService.MetaEntity_initModels(datas,contextJO, paramJO,  $event, xData,this,"MetaEntity");
+    }
+
     /**
      * 逻辑事件
      *