ibizdev提交

app_web/src/components/app-format-data/app-format-data.vue

@@ -31,8 +31,20 @@ export default class AppFormatData extends Vue {
    * @memberof AppFormatData
    */
   getcurValue(){
+    if(this.data){
+      if(this.format){
+        if(this.format.indexOf('%1$t') !== -1){
+          return moment(this.data).format("YYYY-MM-DD HH:mm:ss");
+        }else{
           return moment(this.data).format(this.format);
         }
+      }else{
+        return this.data;
+      }
+    }else{
+      return "";
+    }
+  }
 
 }
 </script>

app_web/src/components/app-image-preview/app-image-preview.vue

@@ -35,13 +35,13 @@ import { Environment } from '@/environments/environment';
 import { Subject, Unsubscribable } from 'rxjs';
 
 @Component({})
-export default class AppImageUpload extends Vue {
+export default class AppImagePreview extends Vue {
 
     /**
      * 表单状态
      *
      * @type {Subject<any>}
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     @Prop() public formState?: Subject<any>
 
@@ -51,7 +51,7 @@ export default class AppImageUpload extends Vue {
      *
      * @private
      * @type {(Unsubscribable | undefined)}
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     private formStateEvent: Unsubscribable | undefined;
 
@@ -59,7 +59,7 @@ export default class AppImageUpload extends Vue {
      * 初始化值
      *
      * @type {*}
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     @Prop() public value?: any;
 
@@ -69,7 +69,7 @@ export default class AppImageUpload extends Vue {
      * @param {*} newval
      * @param {*} val
      * @returns
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     @Watch('value')
     onValueChange(newval: any, val: any) {
@@ -80,28 +80,28 @@ export default class AppImageUpload extends Vue {
      * 所属表单项名称
      *
      * @type {string}
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     @Prop() public name!: string;
 
     /**
      * 上传文件路径
      *
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public uploadUrl = Environment.BaseUrl + Environment.UploadFile;
 
     /**
      * 下载文件路径
      *
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public downloadUrl = Environment.BaseUrl + Environment.ExportFile;
 
     /**
      * 文件列表
      *
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     @Provide() public files = [];
 
@@ -109,7 +109,7 @@ export default class AppImageUpload extends Vue {
      * 设置files
      *
      * @private
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     private setFiles(value:any): void {
         let _files = JSON.parse(value);
@@ -127,7 +127,7 @@ export default class AppImageUpload extends Vue {
     /**
      * vue 生命周期
      *
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public created() {
         if (this.formState) {
@@ -143,7 +143,7 @@ export default class AppImageUpload extends Vue {
     /**
      * vue 生命周期
      *
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public mounted() {
         this.setFiles(this.value);
@@ -152,7 +152,7 @@ export default class AppImageUpload extends Vue {
     /**
      * 组件销毁
      *
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public destroyed(): void {
         if (this.formStateEvent) {
@@ -164,7 +164,7 @@ export default class AppImageUpload extends Vue {
      * 下载文件
      *
      * @param {*} file
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public onDownload(file: any) {
         window.open(file.url);
@@ -174,7 +174,7 @@ export default class AppImageUpload extends Vue {
      * 预览图片地址
      *
      * @type {string}
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public dialogImageUrl: string = '';
 
@@ -182,7 +182,7 @@ export default class AppImageUpload extends Vue {
      * 是否显示预览界面
      *
      * @type {boolean}
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public dialogVisible: boolean = false;
 
@@ -190,7 +190,7 @@ export default class AppImageUpload extends Vue {
      * 预览
      *
      * @param {*} file
-     * @memberof AppImageUpload
+     * @memberof AppImagePreview
      */
     public onPreview(file: any) {
         this.dialogImageUrl = file.url;

app_web/src/components/app-range-editor/app-range-editor.vue

 <template>
     <div class="app-range-editor">
         <template v-for="(item, index) in refFormItem">
-            <span v-if="index > 0" class="editor-space"  :key="index">~</span>
+            <span v-if="index > 0" class="editor-space"  :key="index+10">~</span>
             <date-picker 
              :key="index"
               v-if="Object.is(editorType, 'DATEPICKEREX') || Object.is(editorType, 'DATEPICKEREX_NOTIME')" 

app_web/src/locale/lang/en-US.ts

@@ -5,6 +5,12 @@ import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
 
 export default {
     app: {
+        commonWords:{
+            error: 'Error',
+            success: 'Success',
+            ok: 'OK',
+            cancel: 'Cancel',
+        },
         gridpage: {
             choicecolumns: 'Choice columns',
             refresh: 'refresh',
@@ -32,7 +38,9 @@ export default {
           month: 'month',
           week: 'week',
           day: 'day',
-          list: 'list'
+          list: 'list',
+          dateSelectModalTitle: 'select the time you wanted',
+          gotoDate: 'goto',
         },
         // 非实体视图
         views: {

app_web/src/locale/lang/zh-CN.ts

@@ -5,6 +5,12 @@ import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
 
 export default {
     app: {
+        commonWords:{
+            error: '失败',
+            success: '成功',
+            ok: '确认',
+            cancel: '取消',
+        },
         gridpage: {
             choicecolumns: '选择列',
             refresh: '刷新',
@@ -32,7 +38,9 @@ export default {
           month: '月',
           week: '周',
           day: '天',
-          list: '列'
+          list: '列',
+          dateSelectModalTitle: '选择要跳转的时间',
+          gotoDate: '跳转',
         },
         // 非实体视图
         views: {

app_web/src/pages/dict/ibzdict-edit-view/ibzdict-edit-view-base.vue

@@ -1069,16 +1069,12 @@ export default class IBZDictEditViewBase extends Vue {
      * @memberof IBZDictEditViewBase
      */
     protected SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        // _this 指向容器对象
-        // xData 数据对象
         const _this: any = this;
         if (xData && xData.saveAndExit instanceof Function) {
             xData.saveAndExit().then((response: any) => {
                 if (!response || response.status !== 200) {
-                    _this.$emit('viewdataschange', null);
                     return;
                 }
-                _this.$emit('viewdataschange', [{ ...response.data }]);
                 if(window.parent){
                     window.parent.postMessage([{ ...response.data }],'*');
                 }
@@ -1088,7 +1084,6 @@ export default class IBZDictEditViewBase extends Vue {
                 if (!response || response.status !== 200) {
                     return;
                 }
-                _this.$emit('closeview', [{ ...response.data }]);
                 if(window.parent){
                     window.parent.postMessage([{ ...response.data }],'*');
                 }
@@ -1108,20 +1103,26 @@ export default class IBZDictEditViewBase extends Vue {
      */
     protected RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
-        if (!xData || !(xData.removeAndExit instanceof Function)) {
-            return ;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
                 }
-        xData.removeAndExit(args).then((response: any) => {
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
                 if (!response || response.status !== 200) {
-                _this.$emit('viewdataschange', JSON.stringify({status:'error',action:'removeAndExit'}));
-                return ;
+                    return;
                 }
-            _this.$emit('viewdataschange', JSON.stringify({status:'success',action:'removeAndExit',data:response.data}));
                 if(window.parent){
                     window.parent.postMessage([{ ...response.data }],'*');
                 }
             });
         }
+    }
     /**
      * 开始流程
      *

app_web/src/pages/dict/ibzdict-item-edit-view/ibzdict-item-edit-view-base.vue

@@ -1069,16 +1069,12 @@ export default class IBZDictItemEditViewBase extends Vue {
      * @memberof IBZDictItemEditViewBase
      */
     protected SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        // _this 指向容器对象
-        // xData 数据对象
         const _this: any = this;
         if (xData && xData.saveAndExit instanceof Function) {
             xData.saveAndExit().then((response: any) => {
                 if (!response || response.status !== 200) {
-                    _this.$emit('viewdataschange', null);
                     return;
                 }
-                _this.$emit('viewdataschange', [{ ...response.data }]);
                 if(window.parent){
                     window.parent.postMessage([{ ...response.data }],'*');
                 }
@@ -1088,7 +1084,6 @@ export default class IBZDictItemEditViewBase extends Vue {
                 if (!response || response.status !== 200) {
                     return;
                 }
-                _this.$emit('closeview', [{ ...response.data }]);
                 if(window.parent){
                     window.parent.postMessage([{ ...response.data }],'*');
                 }
@@ -1108,20 +1103,26 @@ export default class IBZDictItemEditViewBase extends Vue {
      */
     protected RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
-        if (!xData || !(xData.removeAndExit instanceof Function)) {
-            return ;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
                 }
-        xData.removeAndExit(args).then((response: any) => {
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
                 if (!response || response.status !== 200) {
-                _this.$emit('viewdataschange', JSON.stringify({status:'error',action:'removeAndExit'}));
-                return ;
+                    return;
                 }
-            _this.$emit('viewdataschange', JSON.stringify({status:'success',action:'removeAndExit',data:response.data}));
                 if(window.parent){
                     window.parent.postMessage([{ ...response.data }],'*');
                 }
             });
         }
+    }
     /**
      * 开始流程
      *

app_web/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.vue

@@ -201,12 +201,12 @@ export default class AppIndexViewBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof AppIndexView
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdict/default-searchform/default-searchform-base.vue

@@ -127,12 +127,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof Default
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdict/main-form/main-form-base.vue

@@ -8,40 +8,16 @@
     
     <row>
         <i-col v-show="detailsModel.ibzdictid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='ibzdictid' :itemRules="this.rules.ibzdictid" class='' :caption="$t('ibzdict.main_form.details.ibzdictid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ibzdictid.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ibzdictid"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ibzdictid.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.ibzdictname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='ibzdictname' :itemRules="this.rules.ibzdictname" class='' :caption="$t('ibzdict.main_form.details.ibzdictname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ibzdictname.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ibzdictname"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ibzdictname.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -156,12 +132,12 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof Main
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdict/main-grid/main-grid-base.vue

@@ -177,12 +177,12 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof Main
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdict/main-grid/main-grid.less

@@ -18,6 +18,13 @@
       background   : #ededed !important;
       border-radius: 10px !important;
     }
+    /*表头过长省略*/
+    .el-table th>.cell{
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      word-break: break-all;
+    }
     .el-table {
       .el-tooltip{
         .ivu-form-item{

app_web/src/widgets/ibzdictitem/default-searchform/default-searchform-base.vue

@@ -127,12 +127,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof Default
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdictitem/main-form/main-form-base.vue

@@ -8,130 +8,46 @@
     
     <row>
         <i-col v-show="detailsModel.ibzdictitemname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='ibzdictitemname' :itemRules="this.rules.ibzdictitemname" class='' :caption="$t('ibzdictitem.main_form.details.ibzdictitemname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ibzdictitemname.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ibzdictitemname"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ibzdictitemname.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.dictitemval.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='dictitemval' :itemRules="this.rules.dictitemval" class='' :caption="$t('ibzdictitem.main_form.details.dictitemval')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dictitemval.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.dictitemval"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.dictitemval.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.pitemval.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='pitemval' :itemRules="this.rules.pitemval" class='' :caption="$t('ibzdictitem.main_form.details.pitemval')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pitemval.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.pitemval"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.pitemval.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.itemfilter.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='itemfilter' :itemRules="this.rules.itemfilter" class='' :caption="$t('ibzdictitem.main_form.details.itemfilter')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.itemfilter.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.itemfilter"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.itemfilter.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.itemcls.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='itemcls' :itemRules="this.rules.itemcls" class='' :caption="$t('ibzdictitem.main_form.details.itemcls')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.itemcls.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.itemcls"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.itemcls.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.itemicon.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='itemicon' :itemRules="this.rules.itemicon" class='' :caption="$t('ibzdictitem.main_form.details.itemicon')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.itemicon.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.itemicon"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.itemicon.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.showorder.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    !!!!模版产生代码错误:Syntax error in template "TEMPLCODE_zh_CN" in line 9, column 435:
-Encountered "=", but was expecting one of:
-    <STRING_LITERAL>
-    <RAW_STRING>
-    "false"
-    "true"
-    <INTEGER>
-    <DECIMAL>
-    "."
-    "+"
-    "-"
-    "!"
-    "["
-    "("
-    "{"
-    <ID>
+    <app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('ibzdictitem.main_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.showorder"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.showorder.disabled" type='number'  style=""></input-box>
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -246,12 +162,12 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof Main
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdictitem/main-grid/main-grid-base.vue

@@ -212,12 +212,12 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 关闭视图
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof Main
      */
-    protected closeView(args: any[]): void {
+    protected closeView(args: any): void {
         let _this: any = this;
-        _this.$emit('closeview', args);
+        _this.$emit('closeview', [args]);
     }
 
     /**

app_web/src/widgets/ibzdictitem/main-grid/main-grid.less

@@ -18,6 +18,13 @@
       background   : #ededed !important;
       border-radius: 10px !important;
     }
+    /*表头过长省略*/
+    .el-table th>.cell{
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      word-break: break-all;
+    }
     .el-table {
       .el-tooltip{
         .ivu-form-item{