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

app_Web/src/locale/lanres/entities/ibizappeditor/ibizappeditor_en_US.ts

@@ -10,9 +10,7 @@ export default {
     ibizappeditortype: "编辑器类型",
     rditordescription: "编辑器描述",
     documentaddress: "文档地址",
-    inbuilteditoramount: "内置编辑器数量",
-    expandeditoramount: "扩展编辑器数量",
-    totalamount: "合计数量",
+    amount: "数量",
   },
 	views: {
 		gridview: {
@@ -43,12 +41,10 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			ibizappeditorid: "编辑器标识", 
+			amount: "数量", 
 			ibizappeditorname: "编辑器名称", 
 			ibizappeditortype: "编辑器类型", 
 			documentaddress: "文档地址", 
-			inbuilteditoramount: "内置编辑器数量", 
-			expandeditoramount: "扩展编辑器数量", 
-			totalamount: "合计数量", 
 			rditordescription: "编辑器描述", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -62,8 +58,6 @@ export default {
 		columns: {
 			ibizappeditorname: "编辑器名称",
 			ibizappeditortype: "编辑器类型",
-			inbuilteditoramount: "内置编辑器数量",
-			expandeditoramount: "扩展编辑器数量",
 			rditordescription: "编辑器描述",
 		},
 		nodata:"",

app_Web/src/locale/lanres/entities/ibizappeditor/ibizappeditor_zh_CN.ts

@@ -9,9 +9,7 @@ export default {
     ibizappeditortype: "编辑器类型",
     rditordescription: "编辑器描述",
     documentaddress: "文档地址",
-    inbuilteditoramount: "内置编辑器数量",
-    expandeditoramount: "扩展编辑器数量",
-    totalamount: "合计数量",
+    amount: "数量",
   },
 	views: {
 		gridview: {
@@ -42,12 +40,10 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			ibizappeditorid: "编辑器标识", 
+			amount: "数量", 
 			ibizappeditorname: "编辑器名称", 
 			ibizappeditortype: "编辑器类型", 
 			documentaddress: "文档地址", 
-			inbuilteditoramount: "内置编辑器数量", 
-			expandeditoramount: "扩展编辑器数量", 
-			totalamount: "合计数量", 
 			rditordescription: "编辑器描述", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -61,8 +57,6 @@ export default {
 		columns: {
 			ibizappeditorname: "编辑器名称",
 			ibizappeditortype: "编辑器类型",
-			inbuilteditoramount: "内置编辑器数量",
-			expandeditoramount: "扩展编辑器数量",
 			rditordescription: "编辑器描述",
 		},
 		nodata:"",

app_Web/src/widgets/ibizappeditor/app-editor-amount-portlet/app-editor-amount-portlet-model.ts

@@ -43,13 +43,7 @@ export default class AppEditorAmountModel {
         name: 'documentaddress',
       },
       {
-        name: 'inbuilteditoramount',
-      },
-      {
-        name: 'expandeditoramount',
-      },
-      {
-        name: 'totalamount',
+        name: 'amount',
       },
     ]
   }

app_Web/src/widgets/ibizappeditor/editor-amount-list/editor-amount-list-model.ts

@@ -16,7 +16,7 @@ export default class EditorAmountModel {
 		return [
 			{
 				name: 'srfamount',
-				prop: 'totalamount',
+				prop: 'amount',
 				dataType: 'INT',
 			},
 			{

app_Web/src/widgets/ibizappeditor/editor-chart-chart/editor-chart-chart-base.vue

@@ -269,117 +269,21 @@ export default class EditorChartBase extends Vue implements ControlInterface {
      * @memberof Db_sysportlet4_chartBase
      */
     public  seriesModel:any = {
-        editortotal:new ChartLineSeries({
-    name:'editortotal',
+        editorareachart:new ChartLineSeries({
+    name:'editorareachart',
     
     
     categorField:'ibizappeditortype',
     categorCodeList:{type:'STATIC',tag:'AppEditorType',emptycode:'empty',emptytext:'未定义'},
     
-    valueField:'totalamount',
+    valueField:'amount',
     seriesValues:[],
     seriesIndex:0,
     data:[],
     seriesMap:{},
     dataSetFields:[
     {name:"ibizappeditortype",codelist:{type:"STATIC",tag:"AppEditorType",emptycode:'empty',emptytext:'未定义'},isGroupField:true,groupMode:""},
-    {name:"totalamount",codelist:null,isGroupField:false,groupMode:""}
-    ],
-    ecxObject:{
-        label:{
-            show: true,
-            position: 'inside'
-        },
-        labelLine:{
-            length: 10,
-            lineStyle: {
-                width: 1,
-                type: 'solid'
-            }
-        },
-        itemStyle:{
-            borderColor: '#fff',
-            borderWidth: 1
-        },
-        emphasis:{
-            label: {
-                fontSize: 20
-            }
-        }
-    },
-    ecObject:{
-    },
-    seriesTemp:{
-        type:'line',
-    },
-    seriesLayoutBy:"column",
-    baseOption:{
-    }
-    })  
-,
-        editorinbuilt:new ChartLineSeries({
-    name:'editorinbuilt',
-    
-    
-    categorField:'ibizappeditortype',
-    categorCodeList:{type:'STATIC',tag:'AppEditorType',emptycode:'empty',emptytext:'未定义'},
-    
-    valueField:'inbuilteditoramount',
-    seriesValues:[],
-    seriesIndex:1,
-    data:[],
-    seriesMap:{},
-    dataSetFields:[
-    {name:"ibizappeditortype",codelist:{type:"STATIC",tag:"AppEditorType",emptycode:'empty',emptytext:'未定义'},isGroupField:true,groupMode:""},
-    {name:"inbuilteditoramount",codelist:null,isGroupField:false,groupMode:""}
-    ],
-    ecxObject:{
-        label:{
-            show: true,
-            position: 'inside'
-        },
-        labelLine:{
-            length: 10,
-            lineStyle: {
-                width: 1,
-                type: 'solid'
-            }
-        },
-        itemStyle:{
-            borderColor: '#fff',
-            borderWidth: 1
-        },
-        emphasis:{
-            label: {
-                fontSize: 20
-            }
-        }
-    },
-    ecObject:{
-    },
-    seriesTemp:{
-        type:'line',
-    },
-    seriesLayoutBy:"column",
-    baseOption:{
-    }
-    })  
-,
-        editorexpand:new ChartLineSeries({
-    name:'editorexpand',
-    
-    
-    categorField:'ibizappeditortype',
-    categorCodeList:{type:'STATIC',tag:'AppEditorType',emptycode:'empty',emptytext:'未定义'},
-    
-    valueField:'expandeditoramount',
-    seriesValues:[],
-    seriesIndex:2,
-    data:[],
-    seriesMap:{},
-    dataSetFields:[
-    {name:"ibizappeditortype",codelist:{type:"STATIC",tag:"AppEditorType",emptycode:'empty',emptytext:'未定义'},isGroupField:true,groupMode:""},
-    {name:"expandeditoramount",codelist:null,isGroupField:false,groupMode:""}
+    {name:"amount",codelist:null,isGroupField:false,groupMode:""}
     ],
     ecxObject:{
         label:{
@@ -482,37 +386,15 @@ export default class EditorChartBase extends Vue implements ControlInterface {
         dataset:[],
         series:[
                      {
-            id:'editortotal',
-            name:'编辑器总数',
+            id:'editorareachart',
+            name:'',
             type:'line',
             xAxisIndex:0,
             yAxisIndex:0,
             datasetIndex:0,
             encode: {
                 x: ['ibizappeditortype'],      
-                y: ['totalamount']
-            }}
-        ,                     {
-            id:'editorinbuilt',
-            name:'内置编辑器',
-            type:'line',
-            xAxisIndex:0,
-            yAxisIndex:0,
-            datasetIndex:1,
-            encode: {
-                x: ['ibizappeditortype'],      
-                y: ['inbuilteditoramount']
-            }}
-        ,                     {
-            id:'editorexpand',
-            name:'扩展编辑器',
-            type:'line',
-            xAxisIndex:0,
-            yAxisIndex:0,
-            datasetIndex:2,
-            encode: {
-                x: ['ibizappeditortype'],      
-                y: ['expandeditoramount']
+                y: ['amount']
             }}
         ]
     };

app_Web/src/widgets/ibizappeditor/editor-chart-portlet/editor-chart-portlet-model.ts

@@ -43,13 +43,7 @@ export default class EditorChartModel {
         name: 'documentaddress',
       },
       {
-        name: 'inbuilteditoramount',
-      },
-      {
-        name: 'expandeditoramount',
-      },
-      {
-        name: 'totalamount',
+        name: 'amount',
       },
     ]
   }

app_Web/src/widgets/ibizappeditor/main-form/main-form-base.vue

@@ -31,21 +31,14 @@
 </i-col>
 <i-col v-show="detailsModel.ibizappeditortype.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='ibizappeditortype' :itemRules="this.rules().ibizappeditortype" class='' :caption="$t('entities.ibizappeditor.main_form.details.ibizappeditortype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ibizappeditortype.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
+    <input-box 
     v-model="data.ibizappeditortype"  
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :formState="formState" 
-    :localContext ='{ }' 
-    :localParam ='{ }' 
+    @enter="onEnter($event)"  
+     unit=""  
     :disabled="detailsModel.ibizappeditortype.disabled" 
-    valueType="string"
-    tag='AppEditorType' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 
@@ -64,54 +57,19 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.inbuilteditoramount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='inbuilteditoramount' :itemRules="this.rules().inbuilteditoramount" class='' :caption="$t('entities.ibizappeditor.main_form.details.inbuilteditoramount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.inbuilteditoramount.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.inbuilteditoramount"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.inbuilteditoramount.disabled" 
-    type='number' 
-    style="">
-</input-box>
-
-</app-form-item>
-
-</i-col>
-<i-col v-show="detailsModel.expandeditoramount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='expandeditoramount' :itemRules="this.rules().expandeditoramount" class='' :caption="$t('entities.ibizappeditor.main_form.details.expandeditoramount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.expandeditoramount.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.expandeditoramount"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.expandeditoramount.disabled" 
-    type='number' 
-    style="">
-</input-box>
-
-</app-form-item>
-
-</i-col>
-<i-col v-show="detailsModel.totalamount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='totalamount' :itemRules="this.rules().totalamount" class='' :caption="$t('entities.ibizappeditor.main_form.details.totalamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.totalamount.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.rditordescription.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='rditordescription' :itemRules="this.rules().rditordescription" class='' :caption="$t('entities.ibizappeditor.main_form.details.rditordescription')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.rditordescription.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
-    v-model="data.totalamount"  
+    v-model="data.rditordescription"  
     @enter="onEnter($event)"  
      unit=""  
-    :disabled="detailsModel.totalamount.disabled" 
-    type='number' 
+    :disabled="detailsModel.rditordescription.disabled" 
+    type='text' 
     style="">
 </input-box>
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.rditordescription.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='rditordescription' :itemRules="this.rules().rditordescription" class='' :caption="$t('entities.ibizappeditor.main_form.details.rditordescription')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.rditordescription.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.rditordescription"  :disabled="detailsModel.rditordescription.disabled" type='textarea' style="" ></input-box>
-
-</app-form-item>
-
 </i-col>
     
     </row>
@@ -575,12 +533,10 @@ export default class MainBase extends Vue implements ControlInterface {
         srfdeid: null,
         srfsourcekey: null,
         ibizappeditorid: null,
+        amount: null,
         ibizappeditorname: null,
         ibizappeditortype: null,
         documentaddress: null,
-        inbuilteditoramount: null,
-        expandeditoramount: null,
-        totalamount: null,
         rditordescription: null,
         createman: null,
         createdate: null,
@@ -649,18 +605,6 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'change' },
             { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'blur' },
         ],
-        inbuilteditoramount: [
-            { required: this.detailsModel.inbuilteditoramount.required, type: 'number', message: '内置编辑器数量 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.inbuilteditoramount.required, type: 'number', message: '内置编辑器数量 值不能为空', trigger: 'blur' },
-        ],
-        expandeditoramount: [
-            { required: this.detailsModel.expandeditoramount.required, type: 'number', message: '扩展编辑器数量 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.expandeditoramount.required, type: 'number', message: '扩展编辑器数量 值不能为空', trigger: 'blur' },
-        ],
-        totalamount: [
-            { required: this.detailsModel.totalamount.required, type: 'number', message: '合计数量 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.totalamount.required, type: 'number', message: '合计数量 值不能为空', trigger: 'blur' },
-        ],
         rditordescription: [
             { required: this.detailsModel.rditordescription.required, type: 'string', message: '编辑器描述 值不能为空', trigger: 'change' },
             { required: this.detailsModel.rditordescription.required, type: 'string', message: '编辑器描述 值不能为空', trigger: 'blur' },
@@ -811,18 +755,14 @@ export default class MainBase extends Vue implements ControlInterface {
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizappeditorid: new FormItemModel({ caption: '编辑器标识', detailType: 'FORMITEM', name: 'ibizappeditorid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        amount: new FormItemModel({ caption: '数量', detailType: 'FORMITEM', name: 'amount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizappeditorname: new FormItemModel({ caption: '编辑器名称', detailType: 'FORMITEM', name: 'ibizappeditorname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizappeditortype: new FormItemModel({ caption: '编辑器类型', detailType: 'FORMITEM', name: 'ibizappeditortype', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         documentaddress: new FormItemModel({ caption: '文档地址', detailType: 'FORMITEM', name: 'documentaddress', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        inbuilteditoramount: new FormItemModel({ caption: '内置编辑器数量', detailType: 'FORMITEM', name: 'inbuilteditoramount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        expandeditoramount: new FormItemModel({ caption: '扩展编辑器数量', detailType: 'FORMITEM', name: 'expandeditoramount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        totalamount: new FormItemModel({ caption: '合计数量', detailType: 'FORMITEM', name: 'totalamount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         rditordescription: new FormItemModel({ caption: '编辑器描述', detailType: 'FORMITEM', name: 'rditordescription', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -945,6 +885,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'ibizappeditorid', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 amount 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.amount')
+    onAmountChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'amount', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 ibizappeditorname 值
      *
@@ -981,42 +933,6 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'documentaddress', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 inbuilteditoramount 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof MainBase
-     */
-    @Watch('data.inbuilteditoramount')
-    onInbuilteditoramountChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'inbuilteditoramount', newVal: newVal, oldVal: oldVal });
-    }
-
-    /**
-     * 监控表单属性 expandeditoramount 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof MainBase
-     */
-    @Watch('data.expandeditoramount')
-    onExpandeditoramountChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'expandeditoramount', newVal: newVal, oldVal: oldVal });
-    }
-
-    /**
-     * 监控表单属性 totalamount 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof MainBase
-     */
-    @Watch('data.totalamount')
-    onTotalamountChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'totalamount', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 rditordescription 值
      *
@@ -1150,8 +1066,6 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
-
-
 
 
 
@@ -2236,6 +2150,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public createDefault(){                    
+        if (this.data.hasOwnProperty('amount')) {
+            this.data['amount'] = 1;
+        }
     }
 
     /**

app_Web/src/widgets/ibizappeditor/main-form/main-form-model.ts

@@ -60,6 +60,11 @@ export default class MainModel {
         prop: 'ibizappeditorid',
         dataType: 'GUID',
       },
+      {
+        name: 'amount',
+        prop: 'amount',
+        dataType: 'INT',
+      },
       {
         name: 'ibizappeditorname',
         prop: 'ibizappeditorname',
@@ -75,21 +80,6 @@ export default class MainModel {
         prop: 'documentaddress',
         dataType: 'TEXT',
       },
-      {
-        name: 'inbuilteditoramount',
-        prop: 'inbuilteditoramount',
-        dataType: 'INT',
-      },
-      {
-        name: 'expandeditoramount',
-        prop: 'expandeditoramount',
-        dataType: 'INT',
-      },
-      {
-        name: 'totalamount',
-        prop: 'totalamount',
-        dataType: 'INT',
-      },
       {
         name: 'rditordescription',
         prop: 'rditordescription',

app_Web/src/widgets/ibizappeditor/main-grid/main-grid-base.vue

@@ -47,30 +47,6 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('inbuilteditoramount')">
-                <el-table-column show-overflow-tooltip :prop="'inbuilteditoramount'" :label="$t('entities.ibizappeditor.main_grid.columns.inbuilteditoramount')" :width="300"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.ibizappeditor.main_grid.columns.inbuilteditoramount')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.inbuilteditoramount}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('expandeditoramount')">
-                <el-table-column show-overflow-tooltip :prop="'expandeditoramount'" :label="$t('entities.ibizappeditor.main_grid.columns.expandeditoramount')" :width="300"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.ibizappeditor.main_grid.columns.expandeditoramount')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.expandeditoramount}}</span>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="getColumnState('rditordescription')">
                 <el-table-column show-overflow-tooltip :prop="'rditordescription'" :label="$t('entities.ibizappeditor.main_grid.columns.rditordescription')" :min-width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -658,24 +634,6 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
-        {
-            name: 'inbuilteditoramount',
-            label: '内置编辑器数量',
-            langtag: 'entities.ibizappeditor.main_grid.columns.inbuilteditoramount',
-            show: true,
-            unit: 'PX',
-            isEnableRowEdit: false,
-            enableCond: 3 ,
-        },
-        {
-            name: 'expandeditoramount',
-            label: '扩展编辑器数量',
-            langtag: 'entities.ibizappeditor.main_grid.columns.expandeditoramount',
-            show: true,
-            unit: 'PX',
-            isEnableRowEdit: false,
-            enableCond: 3 ,
-        },
         {
             name: 'rditordescription',
             label: '编辑器描述',
@@ -1379,7 +1337,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizappeditorname','ibizappeditortype','inbuilteditoramount','expandeditoramount','rditordescription'];
+        let allColumns:Array<any> = ['ibizappeditorname','ibizappeditortype','rditordescription'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1461,8 +1419,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 group: group.label,
                 ibizappeditorname:'',
                 ibizappeditortype:'',
-                inbuilteditoramount:'',
-                expandeditoramount:'',
                 rditordescription:'',
                 children: children
             }
@@ -1493,8 +1449,6 @@ export default class MainBase extends Vue implements ControlInterface {
             group: this.$t('app.gridpage.other'),
             ibizappeditorname:'',
             ibizappeditortype:'',
-            inbuilteditoramount:'',
-            expandeditoramount:'',
             rditordescription:'',
             children: child
         }
@@ -1558,8 +1512,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 group: group,
                 ibizappeditorname:'',
                 ibizappeditortype:'',
-                inbuilteditoramount:'',
-                expandeditoramount:'',
                 rditordescription:'',
                 children: children,
             }

app_Web/src/widgets/ibizappeditor/main-grid/main-grid-model.ts

@@ -26,11 +26,6 @@ export default class MainModel {
       ]
     }else{
 		  return [
-        {
-          name: 'inbuilteditoramount',
-          prop: 'inbuilteditoramount',
-          dataType: 'INT',
-        },
         {
           name: 'ibizappeditorname',
           prop: 'ibizappeditorname',
@@ -46,11 +41,6 @@ export default class MainModel {
           prop: 'rditordescription',
           dataType: 'TEXT',
         },
-        {
-          name: 'expandeditoramount',
-          prop: 'expandeditoramount',
-          dataType: 'INT',
-        },
         {
           name: 'srfmajortext',
           prop: 'ibizappeditorname',
@@ -72,11 +62,6 @@ export default class MainModel {
           prop: 'ibizappeditorid',
           dataType: 'GUID',
         },
-        {
-          name: 'totalamount',
-          prop: 'totalamount',
-          dataType: 'INT',
-        },
         {
           name: 'ibizappeditor',
           prop: 'ibizappeditorid',

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -1199,17 +1199,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -1079,17 +1079,17 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -1079,17 +1079,17 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -1070,17 +1070,17 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -1086,17 +1086,17 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue

@@ -1183,17 +1183,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/ui-action-grid-grid/ui-action-grid-grid-base.vue

@@ -1304,17 +1304,17 @@ export default class UiActionGridBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue

@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -10,14 +10,14 @@ public interface IBIZBOOKDataImport {
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
         @Mapping(target = "createdate", source = "createdate"),
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "updateman", source = "updateman"),
-        @Mapping(target = "updatedate", source = "updatedate"),
-        @Mapping(target = "type", source = "type"),
         @Mapping(target = "press", source = "press"),
+        @Mapping(target = "updateman", source = "updateman"),
         @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
         @Mapping(target = "booknumber", source = "booknumber"),
+        @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "createman", source = "createman"),
+        @Mapping(target = "type", source = "type"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java

@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
         @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
         @Mapping(target = "orderuid", source = "orderuid"),
-        @Mapping(target = "ibizordername", source = "ibizordername"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

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

@@ -32,7 +32,7 @@
 
 
     <!--输出实体[IBIZAPPEDITOR]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappeditor-62-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappeditor-65-2">
         <createTable tableName="T_IBIZAPPEDITOR">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -60,7 +60,7 @@
 
 
     <!--输出实体[IBIZAPPVIEW]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappview-40-3">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappview-41-3">
         <createTable tableName="T_IBIZAPPVIEW">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

demo-provider/demo-provider-demoapi/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 /demo-provider-demoapi.jar
 
-EXPOSE 51000
+EXPOSE 8081
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,24 +3,9 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "51000:51000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - 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_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?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_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: