@bexis2/bexis2-core-ui 0.1.3 → 0.1.5

package/README.md

@@ -1,5 +1,17 @@
 # bexis-core-ui
 
+## v0.1.5 
+### update
+- MultiSelect 
+  - isTargetComplex -> complexTarget
+  - isComplex -> complexSource
+- DropdownKVP
+  - targetIsComplex -> complexTarget
+
+## v0.1.4 
+> test for deploy
+
+
 ## v0.1.3 
 > test table
 

package/dist/components/Table/Table.svelte

@@ -77,7 +77,8 @@ const tableColumns = [
                 filterValue: filterValue2,
                 id,
                 tableId,
-                values
+                values,
+                toFilterableValueFn
               });
             }
           } : void 0,
@@ -149,12 +150,13 @@ const { filterValue } = pluginStates.tableFilter;
 						<tr {...rowAttrs} class="bg-primary-300">
 							{#each headerRow.cells as cell (cell.id)}
 								<Subscribe attrs={cell.attrs()} props={cell.props()} let:props let:attrs>
-									<th scope="col" class="!p-2" {...attrs}>
+									<th scope="col" class="!p-2 w-min" {...attrs}>
 										<div class="flex w-full justify-between items-center">
 											<div class="flex gap-1">
 												<span
 													class:underline={props.sort.order}
 													class:normal-case={cell.id !== cell.label}
+													class:cursor-pointer={!props.sort.disabled}
 													on:click={props.sort.toggle}
 													on:keydown={props.sort.toggle}
 												>
@@ -190,7 +192,7 @@ const { filterValue } = pluginStates.tableFilter;
 						<tr {...rowAttrs}>
 							{#each row.cells as cell (cell?.id)}
 								<Subscribe attrs={cell.attrs()} let:attrs>
-									<td {...attrs} class="!p-2">
+									<td {...attrs} class="!p-2 w-min">
 										<div class="flex items-center w-full h-full table-cell-fit">
 											<Render of={cell.render()} />
 										</div>

package/dist/components/Table/TableFilter.svelte

@@ -5,6 +5,7 @@ export let filterValue;
 export let values;
 export let id;
 export let tableId;
+export let toFilterableValueFn = void 0;
 let firstOption;
 let firstValue;
 let secondOption;
@@ -96,7 +97,7 @@ const popupFeatured = {
   target: popupId,
   placement: "bottom-start"
 };
-let type = typeof $values[0];
+let type = typeof (toFilterableValueFn ? toFilterableValueFn($values[0]) : $values[0]);
 if (type === "object") {
   if ($values[0] instanceof Date) {
     type = "date";
@@ -206,7 +207,7 @@ if (type === "object") {
 				on:click|preventDefault={() => {
 					active = firstValue?.toString().length > 0 || secondValue?.toString().length > 0;
 					$filterValue = [firstOption, firstValue, secondOption, secondValue];
-				}}>Submit</button
+				}}>Apply</button
 			>
 		</div>
 	</div>

package/dist/components/Table/TableFilter.svelte.d.ts

@@ -5,6 +5,7 @@ declare const __propDef: {
         values: any;
         id: any;
         tableId: any;
+        toFilterableValueFn?: ((value: any) => any) | undefined;
     };
     events: {
         click: MouseEvent;

package/dist/components/form/DropdownKvP.svelte

@@ -9,7 +9,7 @@
 	export let invalid = false;
 	export let feedback = [''];
 	export let required = false;
-	export let targetIsComplex = false;
+	export let complexTarget = false;
 
 	$: selected = null;
 
@@ -18,7 +18,7 @@
 
 	function updatedSelectedValue(selection) {
 		if (selection != null) {
-			if(targetIsComplex)
+			if(complexTarget)
 			{
 				selected = selection.id;
 			}
@@ -30,7 +30,7 @@
 	}
 
 	function updatedTarget(id) {
-		if(targetIsComplex)
+		if(complexTarget)
 		{
 			target = source.find((opt) => opt.id === id);
 		}

package/dist/components/form/DropdownKvP.svelte.d.ts

@@ -10,7 +10,7 @@ export default class DropdownKvP extends SvelteComponentTyped<{
     invalid?: boolean | undefined;
     valid?: boolean | undefined;
     feedback?: string[] | undefined;
-    targetIsComplex?: boolean | undefined;
+    complexTarget?: boolean | undefined;
 }, {
     change: Event;
     select: Event;
@@ -32,7 +32,7 @@ declare const __propDef: {
         invalid?: boolean | undefined;
         valid?: boolean | undefined;
         feedback?: string[] | undefined;
-        targetIsComplex?: boolean | undefined;
+        complexTarget?: boolean | undefined;
     };
     events: {
         change: Event;

package/dist/components/form/MultiSelect.svelte

@@ -8,10 +8,10 @@
 	export let target;
 	export let title;
 	export let itemId = 'value';
-	export let label = 'label';
+	export let itemLabel = 'label';
 	export let isMulti = true;
-	export let isComplex = false;
-	export let isTargetComplex = false;
+	export let complexSource = false;
+	export let complexTarget = false;
 	export let required = false;
 	export let feedback = [];
 
@@ -23,12 +23,12 @@
 	function updateTarget(selection) {
 		//diffrent cases
 		console.log('------');
-		console.log('isComplex',isComplex);
-		console.log('isTargetComplex',isTargetComplex);
+		console.log('isComplex',complexSource);
+		console.log('complexTarget',complexTarget);
 		console.log('selection',selection);
 
 		//a) source is complex model is simple
-		if (isComplex && !isTargetComplex && isLoaded) {
+		if (complexSource && !complexTarget && isLoaded) {
 			console.log('a) source is complex model is simple');
 
 			target = [];
@@ -38,14 +38,14 @@
 			}
 		}
 
-		if (!isComplex && !isTargetComplex && isLoaded) {
+		if (!complexSource && !complexTarget && isLoaded) {
 			target = [];
 			for (let i in selection) {
 				target.push(selection[i].value);
 			}
 		}
 
-		if (isComplex && isTargetComplex && isLoaded)
+		if (complexSource && complexTarget && isLoaded)
 		{
 			 console.log("both complex",selection);
 			 target = selection;
@@ -61,7 +61,7 @@
 		//console.log(source);
 
 		//a) source is complex model is simple
-		if (isComplex && !isTargetComplex) {
+		if (complexSource && !complexTarget) {
 			let items = [];
 			// event.detail will be null unless isMulti is true and user has removed a single item
 			for (let i in target) {
@@ -76,14 +76,14 @@
 			//console.log(value);
 		}
 
-		if (isComplex && isTargetComplex)
+		if (complexSource && complexTarget)
 		{
 				value = target
 				isLoaded = true;
 		}
 
 		//b) simple liust and simple model
-		if (!isComplex && !isTargetComplex) {
+		if (!complexSource && !complexTarget) {
 			//console.log("source", source);
 			//console.log("target",target);
 			isLoaded = true;
@@ -100,7 +100,7 @@
 		class="select variant-form-material"
 		items={source}
 		{itemId}
-		{label}
+		label = {itemLabel}
 		multiple={isMulti}
 		bind:value
 		placeholder="-- Please select --"

package/dist/components/form/MultiSelect.svelte.d.ts

@@ -6,12 +6,12 @@ export default class MultiSelect extends SvelteComponentTyped<{
     source: any;
     title: any;
     required?: boolean | undefined;
-    label?: string | undefined;
     feedback?: any[] | undefined;
-    isComplex?: boolean | undefined;
-    isTargetComplex?: boolean | undefined;
+    complexTarget?: boolean | undefined;
     itemId?: string | undefined;
+    itemLabel?: string | undefined;
     isMulti?: boolean | undefined;
+    complexSource?: boolean | undefined;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {}> {
@@ -26,12 +26,12 @@ declare const __propDef: {
         source: any;
         title: any;
         required?: boolean | undefined;
-        label?: string | undefined;
         feedback?: any[] | undefined;
-        isComplex?: boolean | undefined;
-        isTargetComplex?: boolean | undefined;
+        complexTarget?: boolean | undefined;
         itemId?: string | undefined;
+        itemLabel?: string | undefined;
         isMulti?: boolean | undefined;
+        complexSource?: boolean | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/stores/apistore.js

@@ -19,4 +19,5 @@ export function setApiConfig(_host, _user, _pw) {
     hostStore.update((h) => (h = _host));
     usernameStore.update((u) => (u = _user));
     passwordStore.update((p) => (p = _pw));
+    console.log('overwrite host', _host);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bexis2/bexis2-core-ui",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "private": false,
   "scripts": {
     "dev": "vite dev",

package/src/lib/components/Table/Table.svelte

@@ -97,7 +97,8 @@
 												filterValue,
 												id,
 												tableId,
-												values
+												values,
+												toFilterableValueFn
 											});
 										}
 								  }
@@ -175,12 +176,13 @@
 						<tr {...rowAttrs} class="bg-primary-300">
 							{#each headerRow.cells as cell (cell.id)}
 								<Subscribe attrs={cell.attrs()} props={cell.props()} let:props let:attrs>
-									<th scope="col" class="!p-2" {...attrs}>
+									<th scope="col" class="!p-2 w-min" {...attrs}>
 										<div class="flex w-full justify-between items-center">
 											<div class="flex gap-1">
 												<span
 													class:underline={props.sort.order}
 													class:normal-case={cell.id !== cell.label}
+													class:cursor-pointer={!props.sort.disabled}
 													on:click={props.sort.toggle}
 													on:keydown={props.sort.toggle}
 												>
@@ -216,7 +218,7 @@
 						<tr {...rowAttrs}>
 							{#each row.cells as cell (cell?.id)}
 								<Subscribe attrs={cell.attrs()} let:attrs>
-									<td {...attrs} class="!p-2">
+									<td {...attrs} class="!p-2 w-min">
 										<div class="flex items-center w-full h-full table-cell-fit">
 											<Render of={cell.render()} />
 										</div>

package/src/lib/components/Table/TableFilter.svelte

@@ -8,6 +8,7 @@
 	export let values;
 	export let id;
 	export let tableId;
+	export let toFilterableValueFn: undefined | ((value: any) => any) = undefined;
 
 	let firstOption;
 	let firstValue;
@@ -104,7 +105,7 @@
 		placement: 'bottom-start'
 	};
 
-	let type: string = typeof $values[0];
+	let type: string = typeof (toFilterableValueFn ? toFilterableValueFn($values[0]) : $values[0]);
 	if (type === 'object') {
 		if ($values[0] instanceof Date) {
 			type = 'date';
@@ -214,7 +215,7 @@
 				on:click|preventDefault={() => {
 					active = firstValue?.toString().length > 0 || secondValue?.toString().length > 0;
 					$filterValue = [firstOption, firstValue, secondOption, secondValue];
-				}}>Submit</button
+				}}>Apply</button
 			>
 		</div>
 	</div>

package/src/lib/components/form/DropdownKvP.svelte

@@ -9,7 +9,7 @@
 	export let invalid = false;
 	export let feedback = [''];
 	export let required = false;
-	export let targetIsComplex = false;
+	export let complexTarget = false;
 
 	$: selected = null;
 
@@ -18,7 +18,7 @@
 
 	function updatedSelectedValue(selection) {
 		if (selection != null) {
-			if(targetIsComplex)
+			if(complexTarget)
 			{
 				selected = selection.id;
 			}
@@ -30,7 +30,7 @@
 	}
 
 	function updatedTarget(id) {
-		if(targetIsComplex)
+		if(complexTarget)
 		{
 			target = source.find((opt) => opt.id === id);
 		}

package/src/lib/components/form/MultiSelect.svelte

@@ -8,10 +8,10 @@
 	export let target;
 	export let title;
 	export let itemId = 'value';
-	export let label = 'label';
+	export let itemLabel = 'label';
 	export let isMulti = true;
-	export let isComplex = false;
-	export let isTargetComplex = false;
+	export let complexSource = false;
+	export let complexTarget = false;
 	export let required = false;
 	export let feedback = [];
 
@@ -23,12 +23,12 @@
 	function updateTarget(selection) {
 		//diffrent cases
 		console.log('------');
-		console.log('isComplex',isComplex);
-		console.log('isTargetComplex',isTargetComplex);
+		console.log('isComplex',complexSource);
+		console.log('complexTarget',complexTarget);
 		console.log('selection',selection);
 
 		//a) source is complex model is simple
-		if (isComplex && !isTargetComplex && isLoaded) {
+		if (complexSource && !complexTarget && isLoaded) {
 			console.log('a) source is complex model is simple');
 
 			target = [];
@@ -38,14 +38,14 @@
 			}
 		}
 
-		if (!isComplex && !isTargetComplex && isLoaded) {
+		if (!complexSource && !complexTarget && isLoaded) {
 			target = [];
 			for (let i in selection) {
 				target.push(selection[i].value);
 			}
 		}
 
-		if (isComplex && isTargetComplex && isLoaded)
+		if (complexSource && complexTarget && isLoaded)
 		{
 			 console.log("both complex",selection);
 			 target = selection;
@@ -61,7 +61,7 @@
 		//console.log(source);
 
 		//a) source is complex model is simple
-		if (isComplex && !isTargetComplex) {
+		if (complexSource && !complexTarget) {
 			let items = [];
 			// event.detail will be null unless isMulti is true and user has removed a single item
 			for (let i in target) {
@@ -76,14 +76,14 @@
 			//console.log(value);
 		}
 
-		if (isComplex && isTargetComplex)
+		if (complexSource && complexTarget)
 		{
 				value = target
 				isLoaded = true;
 		}
 
 		//b) simple liust and simple model
-		if (!isComplex && !isTargetComplex) {
+		if (!complexSource && !complexTarget) {
 			//console.log("source", source);
 			//console.log("target",target);
 			isLoaded = true;
@@ -100,7 +100,7 @@
 		class="select variant-form-material"
 		items={source}
 		{itemId}
-		{label}
+		label = {itemLabel}
 		multiple={isMulti}
 		bind:value
 		placeholder="-- Please select --"

package/src/lib/components/page/menu/Menu.svelte

@@ -4,8 +4,7 @@
  import { faCog } from '@fortawesome/free-solid-svg-icons'
 
  import { onMount } from 'svelte';
-
-
+ 
  import { getMenuItems}  from './MenuDataCaller';
 
  import type { Menu } from "./menu";
@@ -16,9 +15,7 @@
  let menu:Menu;
 
  onMount(async () => {
-
   
-
   menu = await getMenuItems();
 
 })

package/src/lib/stores/apistore.ts

@@ -22,7 +22,10 @@ passwordStore.subscribe((value) => {
 
 export function setApiConfig(_host: string, _user: string, _pw: string) {
 	console.log('overwrite settings');
+	
 	hostStore.update((h) => (h = _host));
 	usernameStore.update((u) => (u = _user));
 	passwordStore.update((p) => (p = _pw));
+
+	console.log('overwrite host',_host);
 }