@bexis2/bexis2-core-ui 0.1.1 → 0.1.3

package/README.md

@@ -1,4 +1,13 @@
 # bexis-core-ui
+
+## v0.1.3 
+> test table
+
+## v0.1.2
+### update
+- MultiSelect 
+  - return complex type is available now
+
 ## v0.1.1
 ### update
 - Page 

package/dist/components/Table/Table.svelte

@@ -7,6 +7,9 @@ import {
   addColumnFilters,
   addTableFilter
 } from "svelte-headless-table/plugins";
+import { computePosition, autoUpdate, offset, shift, flip, arrow } from "@floating-ui/dom";
+import { storePopup } from "@skeletonlabs/skeleton";
+storePopup.set({ computePosition, autoUpdate, offset, shift, flip, arrow });
 import TableFilter from "./TableFilter.svelte";
 import TablePagination from "./TablePagination.svelte";
 import { columnFilter, searchFilter } from "./filter";

package/dist/components/Table/TableFilter.svelte

@@ -115,7 +115,7 @@ if (type === "object") {
 	</button>
 
 	<div data-popup={`${popupId}`}>
-		<div class="card p-3 absolute grid gap-2 shadow-lg z-10 w-min">
+		<div class="card p-3 absolute grid gap-2 shadow-lg z-10 w-min bg-base-100">
 			<button
 				class="btn variant-filled-primary btn-sm"
 				type="button"

package/dist/components/Table/filter.js

@@ -55,7 +55,7 @@ const dateFilter = (filterOption, filterValue, value) => {
 };
 const numericFilter = ({ filterValue, value }) => {
     const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
-    if (firstFilterValue == null && !secondFilterValue == null) {
+    if (firstFilterValue == null && secondFilterValue == null) {
         return true;
     }
     else if ((firstFilterOption == null || firstFilterValue == null) &&

package/dist/components/form/MultiSelect.svelte

@@ -23,6 +23,9 @@
 	function updateTarget(selection) {
 		//diffrent cases
 		console.log('------');
+		console.log('isComplex',isComplex);
+		console.log('isTargetComplex',isTargetComplex);
+		console.log('selection',selection);
 
 		//a) source is complex model is simple
 		if (isComplex && !isTargetComplex && isLoaded) {
@@ -41,8 +44,16 @@
 				target.push(selection[i].value);
 			}
 		}
-		console.log('selection ' + title, selection);
-		console.log('target ' + title, target);
+
+		if (isComplex && isTargetComplex && isLoaded)
+		{
+			 console.log("both complex",selection);
+			 target = selection;
+			
+		}
+
+		// console.log('selection ' + title, selection);
+		// console.log('target ' + title, target);
 	}
 
 	onMount(async () => {
@@ -55,7 +66,7 @@
 			// event.detail will be null unless isMulti is true and user has removed a single item
 			for (let i in target) {
 				let t = target[i];
-				items.push(source.find((item) => item.key === t));
+				items.push(source.find((item) => item[itemId] === t));
 			}
 
 			isLoaded = true;
@@ -65,6 +76,12 @@
 			//console.log(value);
 		}
 
+		if (isComplex && isTargetComplex)
+		{
+				value = target
+				isLoaded = true;
+		}
+
 		//b) simple liust and simple model
 		if (!isComplex && !isTargetComplex) {
 			//console.log("source", source);

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

@@ -8,10 +8,10 @@ export default class MultiSelect extends SvelteComponentTyped<{
     required?: boolean | undefined;
     label?: string | undefined;
     feedback?: any[] | undefined;
-    itemId?: string | undefined;
-    isMulti?: boolean | undefined;
     isComplex?: boolean | undefined;
     isTargetComplex?: boolean | undefined;
+    itemId?: string | undefined;
+    isMulti?: boolean | undefined;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {}> {
@@ -28,10 +28,10 @@ declare const __propDef: {
         required?: boolean | undefined;
         label?: string | undefined;
         feedback?: any[] | undefined;
-        itemId?: string | undefined;
-        isMulti?: boolean | undefined;
         isComplex?: boolean | undefined;
         isTargetComplex?: boolean | undefined;
+        itemId?: string | undefined;
+        isMulti?: boolean | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/page/menu/Menu.svelte

@@ -1,13 +1,11 @@
 <script>import Fa from "svelte-fa/src/fa.svelte";
 import { faCog } from "@fortawesome/free-solid-svg-icons";
 import { onMount } from "svelte";
-import { setApiConfig } from "../../../stores/apistore";
 import { getMenuItems } from "./MenuDataCaller";
 import MenuBar from "./MenuBar.svelte";
 import SettingsBar from "./SettingsBar.svelte";
 let menu;
 onMount(async () => {
-  setApiConfig("https://localhost:44345", "david", "123456");
   menu = await getMenuItems();
 });
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bexis2/bexis2-core-ui",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "private": false,
   "scripts": {
     "dev": "vite dev",
@@ -39,8 +39,6 @@
     "raw-loader": "^4.0.2",
     "svelte": "^3.54.0",
     "svelte-check": "^3.0.1",
-    "svelte-fa": "^3.0.3",
-    "svelte-headless-table": "^0.17.3",
     "tailwindcss": "^3.3.2",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
@@ -69,7 +67,9 @@
     "highlight.js": "^11.8.0",
     "highlightjs-svelte": "^1.0.6",
     "svelte": "^3.54.0",
+    "svelte-fa": "^3.0.4",
     "svelte-file-dropzone": "^2.0.1",
+    "svelte-headless-table": "^0.17.3",
     "svelte-select": "^5.6.0",
     "vest": "^4.6.11"
   },

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

@@ -8,6 +8,10 @@
 		addColumnFilters,
 		addTableFilter
 	} from 'svelte-headless-table/plugins';
+	import { computePosition, autoUpdate, offset, shift, flip, arrow } from '@floating-ui/dom';
+	import { storePopup } from '@skeletonlabs/skeleton';
+
+	storePopup.set({ computePosition, autoUpdate, offset, shift, flip, arrow });
 
 	import TableFilter from './TableFilter.svelte';
 	import TablePagination from './TablePagination.svelte';

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

@@ -123,7 +123,7 @@
 	</button>
 
 	<div data-popup={`${popupId}`}>
-		<div class="card p-3 absolute grid gap-2 shadow-lg z-10 w-min">
+		<div class="card p-3 absolute grid gap-2 shadow-lg z-10 w-min bg-base-100">
 			<button
 				class="btn variant-filled-primary btn-sm"
 				type="button"

package/src/lib/components/Table/filter.ts

@@ -62,7 +62,7 @@ const dateFilter = (filterOption, filterValue, value) => {
 
 const numericFilter: ColumnFilterFn = ({ filterValue, value }) => {
 	const [firstFilterOption, firstFilterValue, secondFilterOption, secondFilterValue] = filterValue;
-	if (firstFilterValue == null && !secondFilterValue == null) {
+	if (firstFilterValue == null && secondFilterValue == null) {
 		return true;
 	} else if (
 		(firstFilterOption == null || firstFilterValue == null) &&

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

@@ -23,6 +23,9 @@
 	function updateTarget(selection) {
 		//diffrent cases
 		console.log('------');
+		console.log('isComplex',isComplex);
+		console.log('isTargetComplex',isTargetComplex);
+		console.log('selection',selection);
 
 		//a) source is complex model is simple
 		if (isComplex && !isTargetComplex && isLoaded) {
@@ -41,8 +44,16 @@
 				target.push(selection[i].value);
 			}
 		}
-		console.log('selection ' + title, selection);
-		console.log('target ' + title, target);
+
+		if (isComplex && isTargetComplex && isLoaded)
+		{
+			 console.log("both complex",selection);
+			 target = selection;
+			
+		}
+
+		// console.log('selection ' + title, selection);
+		// console.log('target ' + title, target);
 	}
 
 	onMount(async () => {
@@ -55,7 +66,7 @@
 			// event.detail will be null unless isMulti is true and user has removed a single item
 			for (let i in target) {
 				let t = target[i];
-				items.push(source.find((item) => item.key === t));
+				items.push(source.find((item) => item[itemId] === t));
 			}
 
 			isLoaded = true;
@@ -65,6 +76,12 @@
 			//console.log(value);
 		}
 
+		if (isComplex && isTargetComplex)
+		{
+				value = target
+				isLoaded = true;
+		}
+
 		//b) simple liust and simple model
 		if (!isComplex && !isTargetComplex) {
 			//console.log("source", source);

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

@@ -6,7 +6,6 @@
  import { onMount } from 'svelte';
 
 
- import { setApiConfig } from '../../../stores/apistore';
  import { getMenuItems}  from './MenuDataCaller';
 
  import type { Menu } from "./menu";
@@ -18,7 +17,7 @@
 
  onMount(async () => {
 
-  setApiConfig("https://localhost:44345","david","123456");
+  
 
   menu = await getMenuItems();