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

65849daa · ibizdev · 5646622a · 65849daa · 65849daa · 65849daa
--- a/app_Web/src/locale/lang/en-US-base.ts
+++ b/app_Web/src/locale/lang/en-US-base.ts
@@ -228,7 +228,7 @@ function getAppLocale(){
                    menuitem145: commonLogic.appcommonhandle("SelectViewPanel",null),
                    menuitem17: commonLogic.appcommonhandle("WizardPanel",null),
                    menuitem134: commonLogic.appcommonhandle("BasicUsage",null),
-                    menuitem135: commonLogic.appcommonhandle("StateProperties",null),
+                    menuitem135: commonLogic.appcommonhandle("State Properties",null),
                    menuitem121: commonLogic.appcommonhandle("Multi Edit View Panel",null),
                    menuitem115: commonLogic.appcommonhandle("Multiple Forms (row records)",null),
                    menuitem123: commonLogic.appcommonhandle("Multi Form (top page)",null),
@@ -244,14 +244,14 @@ function getAppLocale(){
                    menuitem77: commonLogic.appcommonhandle("TableValueRules",null),
                    menuitem132: commonLogic.appcommonhandle("TableColumnUpdate",null),
                    menuitem133: commonLogic.appcommonhandle("TableColumnReset",null),
-                    menuitem78: commonLogic.appcommonhandle("AutomaticGrouping",null),
-                    menuitem80: commonLogic.appcommonhandle("CodeTableGrouping",null),
+                    menuitem78: commonLogic.appcommonhandle("Automatic Grouping",null),
+                    menuitem80: commonLogic.appcommonhandle("Code Table Grouping",null),
                    menuitem81: commonLogic.appcommonhandle("CurrentPageAggregation",null),
                    menuitem82: commonLogic.appcommonhandle("RemoteAggregation",null),
                    menuitem83: commonLogic.appcommonhandle("List",null),
                    menuitem84: commonLogic.appcommonhandle("BuiltInFeatures",null),
-                    menuitem85: commonLogic.appcommonhandle("AutomaticGrouping",null),
-                    menuitem86: commonLogic.appcommonhandle("CodeTableGrouping",null),
+                    menuitem85: commonLogic.appcommonhandle("Automatic Grouping",null),
+                    menuitem86: commonLogic.appcommonhandle("Code Table Grouping",null),
                    menuitem91: commonLogic.appcommonhandle("ItemLayoutPanel",null),
                    menuitem143: commonLogic.appcommonhandle("CustomPlugIn",null),
                    menuitem95: commonLogic.appcommonhandle("Calendar",null),
@@ -268,13 +268,13 @@ function getAppLocale(){
                    menuitem110: commonLogic.appcommonhandle("TreeGrid",null),
                    menuitem87: commonLogic.appcommonhandle("Data View",null),
                    menuitem88: commonLogic.appcommonhandle("BuiltInFeatures",null),
-                    menuitem89: commonLogic.appcommonhandle("AutomaticGrouping",null),
-                    menuitem90: commonLogic.appcommonhandle("CodeTableGrouping",null),
+                    menuitem89: commonLogic.appcommonhandle("Automatic Grouping",null),
+                    menuitem90: commonLogic.appcommonhandle("Code Table Grouping",null),
                    menuitem94: commonLogic.appcommonhandle("ItemLayoutPanel",null),
                    menuitem152: commonLogic.appcommonhandle("CustomPlugIn",null),
                    menuitem101: commonLogic.appcommonhandle("Kanban View",null),
                    menuitem102: commonLogic.appcommonhandle("BuiltInFeatures",null),
-                    menuitem104: commonLogic.appcommonhandle("CodeTableGrouping",null),
+                    menuitem104: commonLogic.appcommonhandle("Code Table Grouping",null),
                    menuitem105: commonLogic.appcommonhandle("ItemLayoutPanel",null),
                    menuitem37: commonLogic.appcommonhandle("DataChart",null),
                    menuitem38: commonLogic.appcommonhandle("BarChart",null),
@@ -326,15 +326,15 @@ function getAppLocale(){
                    menuitem155: commonLogic.appcommonhandle("Interface Behavior",null),
                    menuitem181: commonLogic.appcommonhandle("Front End Interface Behavior",null),
                    menuitem182: commonLogic.appcommonhandle("Background Interface Behavior",null),
-                    menuitem19: commonLogic.appcommonhandle("TemporaryMode",null),
+                    menuitem19: commonLogic.appcommonhandle("Temporary Mode",null),
                    menuitem2: commonLogic.appcommonhandle("More",null),
-                    menuitem46: commonLogic.appcommonhandle("DataImportAndExport",null),
-                    menuitem184: commonLogic.appcommonhandle("MainState",null),
-                    menuitem70: commonLogic.appcommonhandle("GridMainState",null),
-                    menuitem148: commonLogic.appcommonhandle("ListMainState",null),
-                    menuitem183: commonLogic.appcommonhandle("DataMainState",null),
-                    menuitem28: commonLogic.appcommonhandle("CalendarMainState",null),
-                    menuitem29: commonLogic.appcommonhandle("TreeMainState",null),
+                    menuitem46: commonLogic.appcommonhandle("Data Import And Export",null),
+                    menuitem184: commonLogic.appcommonhandle("Main State",null),
+                    menuitem70: commonLogic.appcommonhandle("Grid Main State",null),
+                    menuitem148: commonLogic.appcommonhandle("List Main State",null),
+                    menuitem183: commonLogic.appcommonhandle("Data Main State",null),
+                    menuitem28: commonLogic.appcommonhandle("Calendar Main State",null),
+                    menuitem29: commonLogic.appcommonhandle("Tree Main State",null),
                    menuitem92: commonLogic.appcommonhandle("其他",null),
                    menuitem93: commonLogic.appcommonhandle("示例实体02示例数据补充",null),
                    menuitem100: commonLogic.appcommonhandle("订单示例数据补充",null),

--- a/app_Web/src/store/modules/view-action/state.ts
+++ b/app_Web/src/store/modules/view-action/state.ts
@@ -787,9 +787,7 @@ export const viewstate: any = {
            viewaction: '',
            viewdatachange: false,
            refviews: [
-                '17770b42972334457baccfe91828bd46',
                '55c0b817ceaaa2894e76b510d94da24c',
-                'ec6cfd868c34a036250a813b24068519',
            ],
        },
        {

--- a/app_Web/src/widgets/app/app-portal-view2-db-dashboard/app-portal-view2-db-dashboard-base.vue
+++ b/app_Web/src/widgets/app/app-portal-view2-db-dashboard/app-portal-view2-db-dashboard-base.vue
@@ -9,7 +9,7 @@
          <span>
                      <div class='portlet-container db-container1 ' :style="{}">
                <row>
-                  <i-col :md="{ span: 24, offset: 0 }">
+                  <i-col :md="{ span: 24, offset: 0 }" :lg="{ span: 12, offset: 6 }">
                      <div class="portlet-without-title">
                          <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
                        <span>

--- a/app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-base.vue
+++ b/app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-base.vue
@@ -57,36 +57,7 @@
                      </span>
                    </template>
                    <template v-slot="{row,column,$index}">
-                        <template v-if="actualIsOpenEdit && !row.children">
-                            <app-form-item :error="gridItemsModel[$index][column.property].error">
-                                
-            <app-picker 
-              :formState="viewState" 
-              :data="row"
-              :context="context"
-              :viewparams="viewparams"
-              :localContext ='{ }' 
-              :localParam ='{ }' 
-              :disabled="getColumnDisabled(row,column.property)" 
-              name='IBIZordername'
-              
-              deMajorField='ibizordername'
-              deKeyField='ibizorder'
-              :service="service"
-              :acParams="{ serviceName: 'IBIZOrderService', interfaceName: 'FetchDefault'}"
-              valueitem='ibizorderid' 
-              :value="row[column.property]" 
-              editortype="" 
-              :pickupView="{ viewname: 'ibizorder-pickup-view', title: $t('entities.ibizorder.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizorders', parameterName: 'ibizorder' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-              style=""  
-              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
-            </app-picker>
-            
-                            </app-form-item>
-                        </template>
-                        <template v-if="!actualIsOpenEdit">
-            <app-span name='IBIZordername' editorType="PICKER" :value="row.ibizordername" dataType="PICKUPTEXT" precision="0" ></app-span>
-                        </template>
+                        <span>{{row.ibizordername}}</span>
                    </template>
                </el-table-column>
            </template>
@@ -101,32 +72,23 @@
                        <template v-if="actualIsOpenEdit && !row.children">
                            <app-form-item :error="gridItemsModel[$index][column.property].error">
                                
-            <app-picker 
-              :formState="viewState" 
-              :data="row"
+             <dropdown-list 
+              v-model="row[column.property]" 
+              :disabled="getColumnDisabled(row,column.property)" 
+              :data="row" 
              :context="context"
-              :viewparams="viewparams"
+              :viewparams="viewparams" 
              :localContext ='{ }' 
              :localParam ='{ }' 
-              :disabled="getColumnDisabled(row,column.property)" 
-              name='IBIZuniproductname'
-              
-              deMajorField='ibizuniproductname'
-              deKeyField='ibizuniproduct'
-              :service="service"
-              :acParams="{ serviceName: 'IBIZUNIProductService', interfaceName: 'FetchDefault'}"
-              valueitem='ibizuniproductid' 
-              :value="row[column.property]" 
-              editortype="" 
-              :pickupView="{ viewname: 'ibizuniproduct-pickup-view', title: $t('entities.ibizuniproduct.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizuniproducts', parameterName: 'ibizuniproduct' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-              style=""  
-              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
-            </app-picker>
+              placeholder='请选择...' 
+              style="" 
+              @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
+             </dropdown-list>
            
                            </app-form-item>
                        </template>
                        <template v-if="!actualIsOpenEdit">
-            <app-span name='IBIZuniproductname' editorType="PICKER" :value="row.ibizuniproductname" dataType="PICKUPTEXT" precision="0" ></app-span>
+            <app-span name='IBIZuniproductname' editorType="DROPDOWNLIST" :value="row.ibizuniproductname" dataType="PICKUPTEXT" precision="0" ></app-span>
                        </template>
                    </template>
                </el-table-column>
@@ -674,7 +636,7 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
     * 
     * @memberof TempModeGridBase
     */
-    public defaultUpdateItems:Array<any> =[,,,,,,];
+    public defaultUpdateItems:Array<any> =[,,,];

    /**
     * 选中行数据
@@ -767,7 +729,7 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
            langtag: 'entities.ibizorderdetail.tempmodegrid_grid.columns.ibizordername',
            show: true,
            unit: 'PX',
-            isEnableRowEdit: true,
+            isEnableRowEdit: false,
            enableCond: 3 ,
        },
        {
@@ -901,11 +863,8 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
     */
    public getGridRowModel(){
        return {
-          IBIZordername: new FormItemModel(),
-          ibizuniproductid: new FormItemModel(),
          IBIZuniproductname: new FormItemModel(),
          ibizorderdetailname: new FormItemModel(),
-          ibizorderid: new FormItemModel(),
          quantity: new FormItemModel(),
          srfkey: new FormItemModel(),
        }
@@ -930,14 +889,6 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
     */
    public rules(){
        return {
-            IBIZordername: [
-                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizordername')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
-                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizordername')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
-            ],
-            ibizuniproductid: [
-                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizuniproductid')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
-                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizuniproductid')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
-            ],
            IBIZuniproductname: [
                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizuniproductname')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizuniproductname')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
@@ -946,10 +897,6 @@ export default class TempModeGridBase extends Vue implements ControlInterface {
                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizorderdetailname')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizorderdetailname')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
            ],
-            ibizorderid: [
-                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizorderid')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
-                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.ibizorderid')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
-            ],
            quantity: [
                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.quantity')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.ibizorderdetail.tempmodegrid_grid.columns.quantity')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },

--- a/app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-model.ts
+++ b/app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-model.ts
@@ -36,13 +36,11 @@ export default class TempModeGridModel {
          name: 'ibizuniproductid',
          prop: 'ibizuniproductid',
          dataType: 'PICKUP',
-          isEditable:true
        },
        {
          name: 'ibizorderid',
          prop: 'ibizorderid',
          dataType: 'PICKUP',
-          isEditable:true
        },
        {
          name: 'ibizordername',

--- a/app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-service.ts
+++ b/app_Web/src/widgets/ibizorder-detail/temp-mode-grid-grid/temp-mode-grid-grid-service.ts
@@ -2,8 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import IBIZOrderDetailService from '@/service/ibizorder-detail/ibizorder-detail-service';
 import TempModeGridModel from './temp-mode-grid-grid-model';
-import IBIZOrderService from '@/service/ibizorder/ibizorder-service';
-import IBIZUNIProductService from '@/service/ibizuniproduct/ibizuniproduct-service';


 /**
@@ -60,22 +58,6 @@ export default class TempModeGridService extends ControlService {
    private remoteCopyData:any = {};


-    /**
-     * 订单服务对象
-     *
-     * @type {IBIZOrderService}
-     * @memberof TempModeGridService
-     */
-    public ibizorderService: IBIZOrderService = new IBIZOrderService();
-
-    /**
-     * 统一产品（索引主实体）服务对象
-     *
-     * @type {IBIZUNIProductService}
-     * @memberof TempModeGridService
-     */
-    public ibizuniproductService: IBIZUNIProductService = new IBIZUNIProductService();
-
    /**
     * 处理数据
     *
@@ -117,12 +99,6 @@ export default class TempModeGridService extends ControlService {
    public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
        data.page = data.page ? data.page : 0;
        data.size = data.size ? data.size : 1000;
-        if (Object.is(serviceName, 'IBIZOrderService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.ibizorderService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'ibizorderid', 'ibizorder');
-        }
-        if (Object.is(serviceName, 'IBIZUNIProductService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.ibizuniproductService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'ibizuniproductid', 'ibizuniproduct');
-        }

        return Promise.reject([])
    }