update: 重置

@VIEW/@MACRO/VIEW_LAYOUTPANEL/VIEW_LAYOUTPANEL_UIACTION/SYS/DATA_CANCELCHANGES.ftl

@@ -12,6 +12,21 @@
      * @param {*} [srfParentDeName]  父实体名称
      */
     public ${item.getFullCodeName()}(args: any[], contextJO?:any, params?: any, $event?: any, xData?: any, actionContext?:any, srfParentDeName?:string) {
-        // 重置
+        if (actionContext.viewType === 'APPLOGINVIEW') {
+            const length = Object.keys(actionContext.layoutData).length;
+            for (let i = length - 1; i >= 0; i--) {
+                const name = Object.keys(actionContext.layoutData)[i];
+                if (actionContext.layoutData.hasOwnProperty(name) && !Object.is(actionContext.layoutDetailsModel[name].itemType, 'CONTAINER')) {
+                    actionContext.handleValueChange(name, { name, value: null });
+                }
+            }
+        } else {
+            const parentRef = actionContext.$parent;
+            if (parentRef.closeView && (parentRef.closeView instanceof Function)) {
+                parentRef.closeView(args);
+            } else if (actionContext.closeView && (actionContext.closeView instanceof Function)) {
+                actionContext.closeView(args);
+            }
+        }
     }
 </#macro>
\ No newline at end of file

@VIEW/@MACRO/VIEW_LAYOUTPANEL/VIEW_LAYOUTPANEL_UIACTION/SYS/LOGIN.ftl

@@ -12,7 +12,7 @@
      * @param {*} [srfParentDeName]  父实体名称
      */
     public ${item.getFullCodeName()}(args: any[], contextJO?:any, params?: any, $event?: any, xData?: any, actionContext?:any, srfParentDeName?:string) {
-        const layoutData = args[0];
+        const layoutData = args.length > 0 ? args[0] : {};
         const layoutModelDetails: any = actionContext.layoutModelDetails || {};
         let userNameKey: string = Object.keys(layoutModelDetails).find((key: string) => Object.is(layoutModelDetails[key].predefinedType, 'AUTH_USERID')) || '';
         let passwordKey: string = Object.keys(layoutModelDetails).find((key: string) => Object.is(layoutModelDetails[key].predefinedType, 'AUTH_PASSWORD')) || '';