quasar-ui-danx 0.4.22 → 0.4.24

package/package.json

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

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

@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="text-xs font-bold">
-      {{ label }}
+      <slot name="label">
+        {{ label }}
+      </slot>
     </div>
     <div :class="valueClass">
       <template v-if="url">

package/src/components/ActionTable/listControls.ts

@@ -364,7 +364,7 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 
 		const latestNextIndex = latestCallOnly("getNextItem", async () => {
 			if (!pagedItems.value?.data) return -1;
-			
+
 			// Load the previous page if the offset is before index 0
 			if (nextIndex < 0) {
 				if (pagination.value.page > 1) {
@@ -439,11 +439,21 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 	 */
 	function updateRouteParams(params: AnyObject) {
 		const vueRouter = getVueRouter();
-		const { name: routeName } = vueRouter.currentRoute.value;
-		vueRouter.push({
-			name: (Array.isArray(routeName) ? routeName[0] : routeName) || "home",
-			params
-		});
+		let { name: routeName } = vueRouter.currentRoute.value;
+		routeName = Array.isArray(routeName) ? routeName[0] : routeName;
+
+		if (!routeName) {
+			console.error("No route name found for list controls", name);
+			return;
+		}
+
+		const newRoutePath = vueRouter.resolve({ name: routeName, params }).href;
+		const currentRoutePath = vueRouter.currentRoute.value.fullPath;
+
+		// Only update the route if the route is different (or the currentRoutePath is a child of the newRoutePath)
+		if (currentRoutePath !== newRoutePath && !currentRoutePath.startsWith(newRoutePath)) {
+			vueRouter.push({ name: routeName, params });
+		}
 	}
 
 	function setPanelFromRoute(params: RouteParams, meta: AnyObject) {

package/src/helpers/formats.ts

@@ -234,7 +234,13 @@ export function fShortSize(value: string | number) {
 	return Math.round(n / div) + " " + power.unit;
 }
 
-export function fBoolean(value?: boolean) {
+export function fBoolean(value?: boolean | string | any) {
+	switch (value) {
+		case "Yes":
+		case "No":
+			return value;
+	}
+
 	return (value === undefined || value === null) ? "-" : (value ? "Yes" : "No");
 }
 
@@ -370,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(/```$/, "");
 }
 
 /**
@@ -378,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":
@@ -390,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\`\`\``;
 	}