@processmaker/screen-builder 2.83.1 → 2.83.3

package/src/components/renderer/form-nested-screen.vue

@@ -18,6 +18,8 @@
 </template>
 
 <script>
+import VueFormRenderer from '../vue-form-renderer.vue';
+
 const globalObject = typeof window === 'undefined'
   ? global
   : window;
@@ -30,6 +32,9 @@ const defaultConfig = [
 ];
 
 export default {
+  components:{
+    VueFormRenderer
+  },
   props: {
     name: String,
     screen: Number,

package/src/components/renderer/form-record-list.vue

@@ -42,9 +42,13 @@
           <template v-else-if="isImage(field, item)">
             <img :src="mustache(field.key, item)" style="record-list-image" />
           </template>
+          <template v-else-if="isWebEntryFile(field, item)">
+            {{ formatIfWebEntryFile(field, item) }}
+          </template>
           <template v-else>
             {{ formatIfDate(mustache(field.key, item)) }}
           </template>
+
         </template>
         <template #cell(__actions)="{ index, item }">
           <div class="actions">
@@ -180,6 +184,7 @@
 <script>
 import _ from "lodash";
 import { dateUtils } from "@processmaker/vue-form-elements";
+import VueFormRenderer from "@/components/vue-form-renderer.vue";
 import mustacheEvaluation from "../../mixins/mustacheEvaluation";
 
 const jsonOptionsActionsColumn = {
@@ -190,6 +195,9 @@ const jsonOptionsActionsColumn = {
 };
 
 export default {
+  components: {
+    VueFormRenderer
+  },
   mixins: [mustacheEvaluation],
   props: [
     "name",
@@ -341,6 +349,23 @@ export default {
         typeof content === "string" && content.substr(0, 11) === "data:image/"
       );
     },
+    isWebEntryFile(field, item) {
+      const content = _.get(item, field.key);
+      const regex = /^webentry_.*:*$/;
+      let checkWebEntryValue = content;
+
+      if (Array.isArray(content)) {
+        checkWebEntryValue = content[0].file;
+      }
+
+      return regex.test(checkWebEntryValue);
+    },
+    formatIfWebEntryFile(field, item) {
+      const requestFiles = _.get(window, "PM4ConfigOverrides.requestFiles", {});
+      const fileInfo = requestFiles[`${field.key}.${item.row_id}`];
+
+      return fileInfo.map((file) => file.file_name).join(", ");
+    },
     isFiledownload(field) {
       return field.key === "__filedownload";
     },

package/src/components/task.vue

@@ -69,6 +69,7 @@
 </template>
 
 <script>
+import VueFormRenderer from './vue-form-renderer.vue';
 import _ from 'lodash';
 import simpleErrorMessage from './SimpleErrorMessage.vue';
 
@@ -80,7 +81,8 @@ const defaultBeforeLoadTask = () => {
 
 export default {
   components:{
-    simpleErrorMessage
+    simpleErrorMessage,
+    VueFormRenderer
   },
   props: {
     initialTaskId: { type: Number, default: null },

package/src/components/vue-form-renderer.vue

@@ -35,10 +35,11 @@ import { getItemsFromConfig } from "../itemProcessingUtils";
 import { ValidatorFactory } from "../factories/ValidatorFactory";
 import CurrentPageProperty from "../mixins/CurrentPageProperty";
 import DeviceDetector, { MAX_MOBILE_WIDTH } from "../mixins/DeviceDetector";
+import ScreenRenderer from "@/components/screen-renderer.vue";
 
 export default {
   name: "VueFormRenderer",
-  components: { CustomCssOutput },
+  components: { ScreenRenderer, CustomCssOutput },
   mixins: [CurrentPageProperty, DeviceDetector],
   model: {
     prop: "data",

package/src/main.js

@@ -269,7 +269,7 @@ window.Echo = {
 
 window.axios = axios.create({
   baseURL: "/api/1.0/",
-  adapter: cacheAdapterEnhancer(axios.defaults.adapter, {
+  adapter: cacheAdapterEnhancer(axios.getAdapter(axios.defaults.adapter), {
     enabledByDefault: window.ProcessMaker.screen.cacheEnabled,
     cacheFlag: "useCache",
     defaultCache: new LRUCache({
@@ -279,7 +279,9 @@ window.axios = axios.create({
   })
 });
 
-const scenario = (window.location.search.substr(1).match(/\w+=(\w+)/) || [])[1];
+const searchParams = new URLSearchParams(window.location.search);
+
+const scenario = searchParams?.get("scenario");
 if (scenario) {
   if (!TestComponents[scenario]) {
     // eslint-disable-next-line no-console