Mosher 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lang/en-US-base.ts

@@ -165,7 +165,7 @@ function getAppLocale(){
                     title: commonLogic.appcommonhandle("门户部件",null),
                 },
                 appportalview: {
-                    caption: commonLogic.appcommonhandle("工作台",null),
+                    caption: commonLogic.appcommonhandle("Work bench",null),
                     title: commonLogic.appcommonhandle("工作台",null),
                 },
                 apppanelview: {

app_Web/src/locale/lanres/entities/ibizorder-detail/ibizorder-detail_en_US_base.ts

@@ -647,18 +647,6 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
-			tbitem24: {
-				caption: commonLogic.appcommonhandle("行编辑",null),
-				tip: commonLogic.appcommonhandle("行编辑",null),
-			},
-			tbitem25: {
-				caption: commonLogic.appcommonhandle("新建行",null),
-				tip: commonLogic.appcommonhandle("新建行",null),
-			},
-			tbitem26: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("Remove",null),
 				tip: commonLogic.appcommonhandle("Remove {0}",null),

app_Web/src/locale/lanres/entities/ibizorder-detail/ibizorder-detail_zh_CN_base.ts

@@ -647,18 +647,6 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
-			tbitem24: {
-				caption: commonLogic.appcommonhandle("行编辑",null),
-				tip: commonLogic.appcommonhandle("行编辑",null),
-			},
-			tbitem25: {
-				caption: commonLogic.appcommonhandle("新建行",null),
-				tip: commonLogic.appcommonhandle("新建行",null),
-			},
-			tbitem26: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("删除",null),
 				tip: commonLogic.appcommonhandle("删除",null),

app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_en_US_base.ts

@@ -48,7 +48,7 @@ function getLocaleResourceBase(){
 	},
 		views: {
 			sf5editview: {
-				caption: commonLogic.appcommonhandle("默认编辑器类型",null),
+				caption: commonLogic.appcommonhandle("Default Editor Type",null),
 				title: commonLogic.appcommonhandle("默认编辑器类型",null),
 			},
 			sf4editview: {
@@ -76,7 +76,7 @@ function getLocaleResourceBase(){
 				title: commonLogic.appcommonhandle("示例实体01表格视图",null),
 			},
 			sf6editview: {
-				caption: commonLogic.appcommonhandle("扩展编辑器",null),
+				caption: commonLogic.appcommonhandle("Extension Editor",null),
 				title: commonLogic.appcommonhandle("扩展编辑器",null),
 			},
 			pickupgridview: {
@@ -88,7 +88,7 @@ function getLocaleResourceBase(){
 				title: commonLogic.appcommonhandle("IBIZSAMPLE0001表格视图",null),
 			},
 			usr3editview: {
-				caption: commonLogic.appcommonhandle("编辑器插件示例",null),
+				caption: commonLogic.appcommonhandle("Editor PlugIn Example",null),
 				title: commonLogic.appcommonhandle("编辑器插件示例",null),
 			},
 		},

app_Web/src/pages/sample/ibizorder-detail-usr2-grid-view9/ibizorder-detail-usr2-grid-view9-base.vue

@@ -13,15 +13,15 @@
                 :context="context" 
                 :isSingleSelect="isSingleSelect"
                 :showBusyIndicator="true"
-                :isOpenEdit="true"
+                :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
                 :isformDruipart="isformDruipart"
                 @save="onSave"
-                updateAction="UpdateTemp"
+                updateAction=""
                 removeAction="RemoveTemp"
-                loaddraftAction="GetDraftTemp"
-                loadAction="GetTemp"
-                createAction="CreateTemp"
+                loaddraftAction=""
+                loadAction=""
+                createAction=""
                 fetchAction="FetchTempDefault"
                 :newdata="newdata"
                 :opendata="opendata"
@@ -66,21 +66,6 @@
                             <div slot='content'>{{$t('entities.ibizorderdetail.usr2gridview9toolbar_toolbar.tbitem6.tip')}}</div>
                         </tooltip>
                         <span class='seperator'>|</span>
-                        <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem24.visabled" :disabled="toolBarModels.tbitem24.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem24' }, $event)">
-                                    
-                                    <span class='caption'>{{$t('entities.ibizorderdetail.usr2gridview9toolbar_toolbar.tbitem24.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibizorderdetail.usr2gridview9toolbar_toolbar.tbitem24.tip')}}</div>
-                        </tooltip>
-                        <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem25.visabled" :disabled="toolBarModels.tbitem25.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem25' }, $event)">
-                                    <i class='fa fa-plus'></i>
-                                    
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibizorderdetail.usr2gridview9toolbar_toolbar.tbitem25.tip')}}</div>
-                        </tooltip>
-                        <span class='seperator'>|</span>
                         <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem8' }, $event)">
                                     
@@ -371,11 +356,6 @@ export default class IBIZOrderDetailUsr2GridView9Base extends Vue {
         tbitem6: { name: 'tbitem6', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem24: { name: 'tbitem24', actiontarget: 'NONE', caption: '行编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleRowEdit', target: '' } },
-
-        tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NewRow', target: '' } },
-
-        tbitem26: {  name: 'tbitem26', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem8: { name: 'tbitem8', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -1237,16 +1217,27 @@ export default class IBIZOrderDetailUsr2GridView9Base extends Vue {
         }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
-            { pathName: 'f7editview', parameterName: 'f7editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'ibizorder-detail-f7-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.ibizorderdetail.views.f7editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -1283,17 +1274,30 @@ export default class IBIZOrderDetailUsr2GridView9Base extends Vue {
         }
         const parameters: any[] = [
             { pathName: 'ibizorderdetails', parameterName: 'ibizorderdetail' },
-            { pathName: 'f7editview', parameterName: 'f7editview' },
         ];
         const _this: any = this;
         if(fullargs && fullargs.copymode){
             Object.assign(data,{copymode:true});
         }
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'ibizorder-detail-f7-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.ibizorderdetail.views.f7editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-base.vue

@@ -29,21 +29,7 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template v-if="actualIsOpenEdit && !row.children">
-                            <app-form-item :error="gridItemsModel[$index][column.property].error">
-                                <input-box 
-              :disabled="getColumnDisabled(row,column.property)" 
-              v-model="row[column.property]" 
-              style=""
-              type="text"
-              
-              
-              @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
-            </input-box>
-            
-                            </app-form-item>
-                        </template>
-                        <template v-if="!actualIsOpenEdit">
+                        <template >
             <app-span name='ibizorderdetailname' editorType="TEXTBOX" :value="row.ibizorderdetailname" dataType="TEXT" precision="0" ></app-span>
                         </template>
                     </template>
@@ -69,25 +55,7 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template v-if="actualIsOpenEdit && !row.children">
-                            <app-form-item :error="gridItemsModel[$index][column.property].error">
-                                
-             <dropdown-list 
-              v-model="row[column.property]" 
-              :disabled="getColumnDisabled(row,column.property)" 
-              :data="row" 
-              :context="context"
-              :viewparams="viewparams" 
-              :localContext ='{ }' 
-              :localParam ='{ }' 
-              placeholder='请选择...' 
-              style="" 
-              @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
-             </dropdown-list>
-            
-                            </app-form-item>
-                        </template>
-                        <template v-if="!actualIsOpenEdit">
+                        <template >
             <app-span name='IBIZuniproductname' editorType="DROPDOWNLIST" :value="row.ibizuniproductname" dataType="PICKUPTEXT" precision="0" ></app-span>
                         </template>
                     </template>
@@ -101,21 +69,7 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template v-if="actualIsOpenEdit && !row.children">
-                            <app-form-item :error="gridItemsModel[$index][column.property].error">
-                                <input-box 
-              :disabled="getColumnDisabled(row,column.property)" 
-              v-model="row[column.property]" 
-              style=""
-              type="text"
-              
-              
-              @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
-            </input-box>
-            
-                            </app-form-item>
-                        </template>
-                        <template v-if="!actualIsOpenEdit">
+                        <template >
             <app-span name='quantity' editorType="TEXTBOX" :value="row.quantity" dataType="INT" precision="0" ></app-span>
                         </template>
                     </template>
@@ -720,7 +674,7 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
             langtag: 'entities.ibizorderdetail.tempmodegrid_grid.columns.ibizorderdetailname',
             show: true,
             unit: 'PX',
-            isEnableRowEdit: true,
+            isEnableRowEdit: false,
             enableCond: 3 ,
         },
         {
@@ -738,7 +692,7 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
             langtag: 'entities.ibizorderdetail.tempmodegrid_grid.columns.ibizuniproductname',
             show: true,
             unit: 'px',
-            isEnableRowEdit: true,
+            isEnableRowEdit: false,
             enableCond: 3 ,
         },
         {
@@ -747,7 +701,7 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
             langtag: 'entities.ibizorderdetail.tempmodegrid_grid.columns.quantity',
             show: true,
             unit: 'px',
-            isEnableRowEdit: true,
+            isEnableRowEdit: false,
             enableCond: 3 ,
         },
         {