Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev

@CONTROL/@MACRO/SERVICE/FORM.ts.ftl

@@ -164,11 +164,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isWorkflow] 是否在工作流中添加数据
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}Service
      */
     @Errorlog
-    public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
         <#-- 手动修改数据主键的情况start -->
         <#list ctrl.getPSDEFormItems() as formitem>
@@ -188,8 +189,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                 result = this.appEntityService.Create(Context,Data, isloading);
             }
             result.then((response) => {
-                this.handleResponse(action, response);
-                resolve(response);
+                if(isWorkflow){
+                    resolve(response);
+                }else{
+                    this.handleResponse(action, response);
+                    resolve(response);
+                }
             }).catch(response => {
                 reject(response);
             });
@@ -232,11 +237,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isWorkflow] 是否在工作流中修改数据
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}Service
      */
     @Errorlog
-    public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public update(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
@@ -247,8 +253,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                 result = this.appEntityService.Update(Context,Data, isloading);
             }
             result.then((response) => {
-                this.handleResponse(action, response);
-                resolve(response);
+                if(isWorkflow){
+                    resolve(response);
+                }else{
+                    this.handleResponse(action, response);
+                    resolve(response);
+                }
             }).catch(response => {
                 reject(response);
             });

@CONTROL/表单/CONTROL-BASE.vue.ftl

@@ -1387,13 +1387,17 @@ import schema from 'async-validator';
         return new Promise((resolve: any, reject: any) => {
         const _this: any = this;
         const arg: any = data[0];
+        const copyData:any = Util.deepCopy(arg);
         Object.assign(arg,{viewparams:this.viewparams});
         if (!arg.${ctrl.getPSAppDataEntity().getCodeName()?lower_case} || Object.is(arg.${ctrl.getPSAppDataEntity().getCodeName()?lower_case}, '')) {
             return;
         }
-        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,true):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,true);
         post.then((response:any) =>{
-                const arg:any = response.data;
+                const responseData:any = response.data;
+                let tempResponseData:any = Util.deepCopy(response);
+                this.service.handleResponse('save', tempResponseData);
+                const arg:any = tempResponseData.data;
                 // 保存完成UI处理
                 this.onFormLoad(arg,'save');
                 this.$emit('save', arg);
@@ -1404,11 +1408,12 @@ import schema from 'async-validator';
                     this.formState.next({ type: 'save', data: arg });
                 });
                 // 准备工作流数据,填充未存库数据
-                Object.assign(arg,this.getData());
+                Object.assign(arg,copyData);
                 // 准备提交参数
                 if(this.viewparams){
-                    Object.assign(arg,{viewparams:this.viewparams});
+                    Object.assign(responseData,this.viewparams);
                 }
+                Object.assign(arg,{viewparams:responseData});
                 // 强制补充srfwfmemo
                 if(this.srfwfmemo){
                     Object.assign(arg,{srfwfmemo:this.srfwfmemo});

@EDITOR/下拉列表框（cron表达式）/EDITOR.vue.ftl

+<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<cron-editor
+    :disabled="detailsModel.${editor.name}.disabled"
+    placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> />
\ No newline at end of file

@EDITOR/下拉列表框（cron表达式）/GRIDEIDTOR.vue.ftl

+<dropdown-list-mpicker 
+  v-model="row[column.property]" 
+  :itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>" 
+  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"  
+<#if item.getPSCodeList()??>
+  <#assign codelist=editor.getPSCodeList()>
+  tag='${codelist.codeName}' 
+  codelistType='${codelist.getCodeListType()}'
+  <#if codelist.valueSeparator?has_content>valueSeparator="${codelist.valueSeparator}"</#if>
+</#if> 
+  placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if>
+  @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"
+  style="${item.getEditorCssStyle()}">
+</dropdown-list-mpicker>
\ No newline at end of file

@EDITOR/下拉列表框（cron表达式）/PANELEDITOR.vue.ftl

+<#ibizinclude>../@MACRO/PANEL/DEFAULT.vue.ftl</#ibizinclude>
\ No newline at end of file

@EDITOR/下拉列表框（cron表达式）/template.properties

+EDITORTYPE=MDROPDOWNLIST#CRONEDITOR
\ No newline at end of file

@VIEW/应用首页视图/ROUTER.ts.ftl

@@ -362,5 +362,10 @@ const router = new Router({
         },
     ],
 });
-
+// 解决路由跳转路由重复时报错
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location: any) {
+    let result: any = originalPush.call(this, location);
+    return result.catch((err: any) => err);
+}
 export default router;