quasar-ui-danx 0.4.23 → 0.4.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.4.23",
+  "version": "0.4.26",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/ActionTable/Form/Fields/SingleFileField.vue

@@ -6,7 +6,9 @@
     @drop.prevent="onDrop"
   >
     <FieldLabel
-      :field="field"
+      v-if="label || (name || showName)"
+      :label="label"
+      :name="name"
       :show-name="showName"
       class="text-sm font-semibold"
     />
@@ -35,7 +37,7 @@
       v-if="!readonly || uploadedFile"
       class="w-32 cursor-pointer mt-2"
       :class="{'border border-dashed border-blue-600': !uploadedFile, 'mx-auto': !readonly}"
-      :file="uploadedFile"
+      :file="uploadedFile || undefined"
       downloadable
       @click="!disable && $refs.file.click()"
     />
@@ -48,26 +50,22 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { onMounted } from "vue";
 import { useSingleFileUpload } from "../../../../helpers";
+import { UploadedFile } from "../../../../types";
 import { FilePreview } from "../../../Utility";
 import FieldLabel from "./FieldLabel";
 
 const emit = defineEmits(["update:model-value"]);
-const props = defineProps({
-	modelValue: {
-		type: [Object, String],
-		default: null
-	},
-	field: {
-		type: Object,
-		required: true
-	},
-	showName: Boolean,
-	disable: Boolean,
-	readonly: Boolean
-});
+const props = defineProps<{
+	modelValue?: UploadedFile;
+	label?: string;
+	name?: string;
+	showName?: boolean;
+	disable?: boolean;
+	readonly?: boolean;
+}>();
 const { onComplete, onDrop, onFileSelected, uploadedFile, clearUploadedFile } = useSingleFileUpload();
 onComplete(() => emit("update:model-value", uploadedFile.value));
 

package/src/helpers/formats.ts

@@ -376,7 +376,7 @@ export function parseMarkdownYAML(string: string): object | null | false {
  * Parse a markdown formatted string and return the code block content
  */
 export function parseMarkdownCode(string: string): string {
-	return string.replace(/^```[a-z0-9]{1,6}\s/, "").replace(/```$/, "");
+	return string.replace(/^```[a-z0-9]{0,6}\s/, "").replace(/```$/, "");
 }
 
 /**
@@ -384,6 +384,7 @@ export function parseMarkdownCode(string: string): string {
  * ie: a valid JSON string with a ```json prefix and ``` postfix
  */
 export function fMarkdownCode(type: string, string: string | object): string {
+	console.log("formatting", type, string);
 	if (typeof string === "object" || isJSON(string)) {
 		switch (type) {
 			case "yaml":
@@ -396,7 +397,9 @@ export function fMarkdownCode(type: string, string: string | object): string {
 	}
 
 	const regex = new RegExp(`\`\`\`${type}`, "g");
-	if (!((string || "") as string).match(regex)) {
+	string = (string || "") as string;
+	if (!string.match(regex)) {
+		string = parseMarkdownCode(string as string);
 		return `\`\`\`${type}\n${string}\n\`\`\``;
 	}