hebao1234 发布系统代码 [ibz-dst，应用]

app_web/src/components/app-file-upload/app-file-upload.vue

@@ -9,6 +9,9 @@
           :disabled="disabled"
           :file-list="files"
           :action="uploadUrl"
+          :limit="multiple ? limit: 1"
+          :accept="accept"
+          :multiple="multiple"
           :headers="{}"
           :before-upload="beforeUpload"
           :before-remove="onRemove"
@@ -17,6 +20,7 @@
           :on-preview="onDownload"
           :drag="isdrag"
           :show-file-list="!rowPreview"
+          :on-exceed = "handleExceed"
           >
             <el-button v-if="!isdrag" size='small' icon='el-icon-upload' :disabled="disabled">{{this.$t('app.fileUpload.caption')}}</el-button>
           <i v-if="isdrag" class="el-icon-upload"></i>
@@ -173,6 +177,30 @@ export default class AppFileUpload extends Vue {
      */
     @Prop() public exportparams?: any;
 
+    /**
+     * 是否支持多个文件上传
+     *
+     * @type {string}
+     * @memberof AppFileUpload
+     */
+    @Prop({default: true}) public multiple!: boolean;
+
+    /**
+     * 最大允许上传个数
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: 9999}) public limit!: number;
+
+    /**
+     * 接受上传的文件类型
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: '*'}) public accept!: string;
+
     /**
      * 上传文件路径
      *
@@ -473,6 +501,14 @@ export default class AppFileUpload extends Vue {
      */
     public showActions: boolean = false;
 
+    /**
+     * 处理多选超出
+     *
+     * @memberof AppFileUpload
+     */
+    public handleExceed(files: any, fileList: any) {
+      this.$message.warning(`${this.$t('components.appFileUpload.limitselect')} ${this.limit}`);
+    }
 
 }
 </script>

app_web/src/components/app-icon-menus/app-icon-menus.vue

 <template>
   <div class="app-icon-menus">
     <template v-for="(item,index) in menus">
+      <template v-if="!item.hidden">
         <div :bordered="false" v-if="item.items && Array.isArray(item.items)" :key="index" :class="item.textcls">
           <p @click="$emit('menuClick',item.name, [item.name])">
             <span>{{$t('app.menus.' + ctrlName + '.' + item.name)}}</span>
@@ -32,6 +33,7 @@
           </div>
         </el-card>
       </template>
+    </template>
   </div>
 </template>
 

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

@@ -32,11 +32,14 @@
     <!-- 文件上传 -->
     <el-upload 
       v-if = "multiple || files.length === 0" 
+      :limit="multiple ? limit: 1"
       :class = "{'el-upload-disabled':disabled}"
       :disabled = "disabled"
       :action = "uploadUrl"
       :headers = "{ 'srfappdata': appData }"
       :show-file-list = "false"
+      :multiple="multiple"
+      :accept="accept"
       list-type =  "picture-card"
       :file-list =  "files"
       :before-upload = "beforeUpload"
@@ -44,6 +47,7 @@
       :before-remove = "onRemove"
       :on-error = "onError"
       :on-preview = "onDownload"
+      :on-exceed = "handleExceed"
       >
       <i class="el-icon-plus"></i>
     </el-upload>
@@ -180,6 +184,22 @@ export default class AppImageUpload extends Vue {
      */
     @Prop() public customparams?: any;
 
+    /**
+     * 最大允许上传个数
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: 9999}) public limit!: number;
+
+    /**
+     * 接受上传的文件类型
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: 'image/*'}) public accept!: string;
+
     /**
      * 上传文件路径
      *
@@ -472,6 +492,15 @@ export default class AppImageUpload extends Vue {
         this.dialogImageUrl = file.url;
         this.dialogVisible = true;
     }
+
+    /**
+     * 处理多选超出
+     *
+     * @memberof AppImageUpload
+     */
+    public handleExceed(files: any, fileList: any) {
+      this.$message.warning(`${this.$t('components.appImageUpload.limitselect')} ${this.limit}`);
+    }
 }
 </script>
 <style lang = "less">

app_web/src/locale/lanres/components/components_en_US_base.ts

@@ -68,6 +68,7 @@ function getLocaleResourceBase(){
         uploadText: 'Drag files here，or <em>Click</em> to upload',
         fileTypeErrorTitle: 'File type incorrect',
         fileTypeErrorInfo: 'Please select files with picture types，such as JPEG，GIF，PNG，BMP',
+        limitselect: 'The current number of restricted choices is ',
       },
       appFormDRUIPart: {
         blockUITipInfo: 'Please save the major data first',
@@ -208,7 +209,8 @@ function getLocaleResourceBase(){
         groupSelect:'Group selection', 
       },
       appImageUpload:{
-        uploadFail:'Upload failed'
+        uploadFail:'Upload failed',
+        limitselect: 'The current number of restricted choices is ',
       },
       appOrgSelect:{
         loadFail:'Failed to load data'

app_web/src/locale/lanres/components/components_zh_CN_base.ts

@@ -69,6 +69,7 @@ function getLocaleResourceBase(){
         uploadError: '上传失败',
         fileTypeErrorTitle: '文件类型错误',
         fileTypeErrorInfo: '请选择图片类型的文件，如JPEG，GIF，PNG，BMP',
+        limitselect: '当前限制选择数量为 ',
       },
       appFormDRUIPart: {
         blockUITipInfo: '请先保存主数据',
@@ -209,7 +210,8 @@ function getLocaleResourceBase(){
         groupSelect:'分组选择', 
       },
       appImageUpload:{
-        uploadFail:'上传失败'
+        uploadFail:'上传失败',
+        limitselect: '当前限制选择数量为 ',
       },
       appOrgSelect:{
         loadFail:'加载数据失败'

app_web/src/setting/index.ts

+export * from './project-setting';
\ No newline at end of file

app_web/src/setting/project-setting.ts

+export const ProjectSetting = {
+  routeSetting: {},
+};

app_web/src/styles/default.less

@@ -278,6 +278,10 @@
 .start-workflow-select-wraper {
     z-index: 3000 !important;
 }
+// tooltip最大宽度1166px
+.el-tooltip__popper.is-dark{
+  max-width: 1166px;
+}
 
 /***    END:多数据视图属性布局    ***/
 

app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue

@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -734,7 +734,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue

@@ -331,6 +331,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -853,7 +867,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -948,7 +962,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1054,7 +1068,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1847,7 +1861,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcatalogpickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcataloggridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1914,7 +1928,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcatalogpickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcataloggridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1985,7 +1999,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1993,7 +2007,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.dictcatalog){
@@ -2060,7 +2074,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/dst-data-source/default-searchform/default-searchform-base.vue

@@ -662,7 +662,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/dst-data-source/main-grid/main-grid-base.vue

@@ -307,6 +307,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -811,7 +825,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -906,7 +920,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1012,7 +1026,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1799,7 +1813,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dstdatasourcepickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dstdatasourcegridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1866,7 +1880,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dstdatasourcepickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dstdatasourcegridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1937,7 +1951,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1945,7 +1959,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.dstdatasource){
@@ -2018,7 +2032,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourcePickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DstDataSourceGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/meta-entity/default-searchform/default-searchform-base.vue

@@ -795,7 +795,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -831,7 +831,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue

@@ -343,6 +343,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -874,7 +888,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -969,7 +983,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1075,7 +1089,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1871,7 +1885,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1938,7 +1952,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -2009,7 +2023,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2017,7 +2031,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.metaentity){
@@ -2084,7 +2098,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue

@@ -838,7 +838,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -874,7 +874,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/rule-item/main-grid/main-grid-base.vue

@@ -393,6 +393,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -960,7 +974,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1055,7 +1069,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1161,7 +1175,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1977,7 +1991,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -2044,7 +2058,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -2115,7 +2129,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2123,7 +2137,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ruleitem){
@@ -2196,7 +2210,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;