Merge tag '2.2.0' into develop

src/loader/bridge.loader.ts

@@ -31,7 +31,7 @@ export default function bridgeLoader(): DEV.Loader {
     return 0;
   };
   window.AIO.print ??= (value) => {
-    (window as any).sixWisdom.printPdfByUrl(value);
+    return (window as any).sixWisdom?.printPdfByUrl?.(value) ?? (function() { throw { message: `当前环境不支持` } })();
   };
 
   return async function (app, config) {

src/modules/report/report.page.vue

@@ -20,7 +20,7 @@ const hidePulseExceptionTemplate = computed(() => platformIsAIO())
 const Visitor = useVisitor();
 const id = useRouteParams<string>('id', Visitor.reportId);
 const scrollable = ref(true);
-const closeable = computed(() => !data.value.payLock);
+const closeable = computed(() => !data.value.payLock || data.value.page.printable || data.value.page.jumpable);
 const { data, loading } = useWatcher(() => getReportMethod(id.value), [ id ], {
   initialData: {
     descriptionsTable: { column: [], data: [] },

src/request/model/index.ts

@@ -10,19 +10,19 @@ export function application(data: Record<string, any>) {
   const image = analysis(
     [
       ['preset', '\\d+', '1'],
-      ['el', '[\\w|]+', 'scan|btn'],
+      ['el', '[\\w|]+', ''],
       ['page', '/\\w+', '/screen'],
       ['com', '[^;]+'],
       ['title', '[^;]+'],
     ] as const,
     data?.tabletDrainageImage
   );
-  if (image.preset === '1') image.el ??= `scan|btn`;
-  else if (image.preset === '2') {
+  if (!image.el) image.el = void 0 as any;
+  if (image.preset === '2') {
     image.el ??= `scan`;
     image.com ??= `scan.page`
     image.title ??= `萧山区中医智能辅诊系统`
-  }
+  } else image.el ??= `btn`;
 
   return {
     copyright: [data?.partner, data?.technicalSupporter].filter(Boolean).join('<br>'),