Old dev (#675)

* update ky, fix ag to svelte example, RestDataApi will look for q and do stringify if its an object * Fixed quick search * Fixed search * refactor select2 so uses same fomratter for displayFields * comment out select tests since we dont support * get tests working for jest and ts. revamp truthy and empty * add jest to the checks * remove the setup for now * get jest tests working and move critical tests in, all tests are in __tests__ * Select fixes (#643) * Fixed select with complex dataApiParams * Lint fix * esm to get mockserver working with imports * reverted ts, to slow. * fix and cleanup the listctrl dep (#644) * fix and cleanup the listctrl dep * should have a property that we pass to GRidCtrl for contextMenuClickAction * pass everything through with the gridOpts * fixed showSearchForm * more clean up * cleanup to get rid of extendFilters * removed a bunch of console logs * add init search to config * Filtering refactoring Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * Grid remove listctrl dep (#645) * fix and cleanup the listctrl dep * should have a property that we pass to GRidCtrl for contextMenuClickAction * pass everything through with the gridOpts * fixed showSearchForm * more clean up * cleanup to get rid of extendFilters * removed a bunch of console logs * add init search to config * Filtering refactoring * get sort squared away * more lodash cleanup * fix for es6 * rename to restrictSearch * add start of the DataQuery class Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * Grid remove listctrl dep (#646) * fix and cleanup the listctrl dep * should have a property that we pass to GRidCtrl for contextMenuClickAction * pass everything through with the gridOpts * fixed showSearchForm * more clean up * cleanup to get rid of extendFilters * removed a bunch of console logs * add init search to config * Filtering refactoring * get sort squared away * more lodash cleanup * fix for es6 * rename to restrictSearch * add start of the DataQuery class Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * fixed foo bar * Grid fixes (#648) * Fixed cors issue for grids * Grid actions without listCtrl import * Custom toolbar actions * Fixed typo Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com> * Datastore (#647) * added mixer and batch of tests * added getter * added ky type * get common stuff out on datastore * rename * removed grails from demo to cut down on noise * fix session store * working demos * working grids, select2 is broken * mostly working now * renames * simplify * out of chaos comes order * det names in order * fix oageView sub, add unsun for destroy * rm pwd * lint fix * added chip and fixed setting current item * fix bad comma * added chip css * hack to fix sub on addJson * add go to AppState and apiUrl * redo api to standardize key instead of endpoint * add some logging * more logging * remove pocs * Restrict apply grids (#651) * grids adde restrict search * gridList restrictSearch * Fixed grid toolbar (#652) * TEmp quick fix (#653) * Ds grid (#654) * fix open on memdata, dont blow up if no config is found, fix tailwind warning * Fixed editting grid (#655) * fix bad squigly * tests passing again * remove bad case * flush out forms and bad camel case on StoreHolder * z-index on selects * fix select2 ability to have special key * fixes grid flash on insert 9ci/rcm-ui#102 * Edit modal errors 9ci/rcm#110 (#656) * Edit modal errors 9ci/rcm#110 * see if this works Co-authored-by: Joshua B <joshdev@9ci.com> * Fixed typo for error handler (#657) * change to html5 date inputs * remove placeholder until we figure it out * Swal fix (#658) * Remove swal from grids * Fixed typo * Added ctx to gridz directive (#660) * Fixed export to excel 9ci/rcm-ui#118 (#659) * Svelte select (#661) * Fix Date Formatting (#662) * Added ability to change restrict search (#663) * Added ability to specify qSearch and q for select (#664) * Added ability to specify qSearch and q for select * Added XXX * change for more detailed format on selects * Fixed gridId genaration (#666) * yakit move (#667) move to @yakit/core, @yakit/ui, @yakit/svelte * Added ability to set deafult sorting (#668) * forms and crudQuery (#671) * add tile comps and import text-editor from f7. * Grid edit popover (#672) * popover edit, formify from config with yup validation and examples. * on submit * edit example is working * create new popup working but failing on save * popover working for new * moved create form into core * fix tests * fix where editSchema get setup * add example for rest select in dynamic * added showLink formatter and fixed for type=date on schema forms * fixed sort reset and turned off multiSort by default * edit and create working, form mods, styling for grid check boxes. Add tests for create-form Co-authored-by: alexeyzvegintcev <alexey.zvegintcev@sysgears.com>
yakworks · Feb 3, 2022 · 4242be4 · 4242be4
1 parent 87d793c
commit 4242be4
Show file tree

Hide file tree

Showing 23 changed files with 1,202 additions and 164 deletions.
diff --git a/examples/demo/src/formify/basic/Basic.svelte b/examples/demo/src/formify/basic/Basic.svelte
@@ -1,7 +1,7 @@
 <script>
   import { BlockTitle, Columns, Col, Card, CardContent,
     Select, Button, Button7, CardFooter, Link } from '@yakit/svelte/index';
-  import { ListForm, ListField, ListSelect, ListRangeFields, ListToggle } from '@yakit/svelte/Formify';
+  import { ListForm, ListField, ListSelect, ListRangeFields, ListToggle, ListChipInput } from '@yakit/svelte/Formify';
   import stringify from 'fast-safe-stringify'
 
   //array of object data. identifier defaults to id and label is name.
@@ -46,8 +46,9 @@
           <ListField name="dates.date1" type="date"/>
           <ListField name="dates.date2" type="date"/>
           <ListToggle name="toggle" />
-          <ListRangeFields name="dates.dateRange"type="date"/>
-          <ListRangeFields name="dates.amountRange"type="number"/>
+          <ListChipInput name="chips" />
+          <ListRangeFields name="dates.dateRange" type="date"/>
+          <ListRangeFields name="dates.amountRange" type="number"/>
           <ListSelect name="selects.simple" opts={{label:"Select", placeholder:"Id Value Select"}} itemData={simpleData}/>
           <ListSelect name="selects.customer"
             opts={{ label:"Select", placeholder:"Id Value Select", dataApiKey: 'customer' }}/>

diff --git a/examples/demo/src/formify/dynamic/Dynamic.svelte b/examples/demo/src/formify/dynamic/Dynamic.svelte
@@ -41,6 +41,9 @@
         data:[{id:0, name: 'Open'}, {id:1, name: 'Closed'}]
       }
     },
+    chips:{
+      input: "chips"
+    },
     customer:{
       input: 'select',
       selectOptions:{

diff --git a/examples/demo/src/formify/search/SearchForm.svelte b/examples/demo/src/formify/search/SearchForm.svelte
@@ -1,8 +1,14 @@
 <script>
   import { Columns, Col, BlockTitle, Card, CardContent, Button } from '@yakit/svelte/index'
-  import { FormifyColumns } from '@yakit/svelte/Formify';
+  import { Formify } from '@yakit/svelte/Formify';
   import stringify from 'fast-safe-stringify'
 
+  let opts ={
+    initData: {
+      ponum: 'Bill',
+    }
+  }
+
   let schema = {
     column1:[
       {key: "refnum", type: "input-list"},
@@ -83,7 +89,7 @@
 
 </script>
 
-<FormifyColumns {schema} bind:data bind:formContext bind:transformedSchema/>
+<Formify name="search-example" {opts} {schema} bind:data bind:formContext bind:transformedSchema/>
 
 <Button class="mt-1" on:click={setPizza}>Pizza all around</Button>
 <Button class="mt-1" on:click={clearForm}>Clear</Button>

diff --git a/examples/demo/src/svelteDataList/simple/SimpleGrid.svelte b/examples/demo/src/svelteDataList/simple/SimpleGrid.svelte
@@ -22,18 +22,60 @@
 
   let editForm = {
     'customer.name':{ required: true },
-    state:{
-      input: 'select',
-      selectOptions:{
-        isValueObject: true,
-        data:[{id:0, name: 'Open'}, {id:1, name: 'Closed'}]
+    // state:{
+    //   input: 'select',
+    //   selectOptions:{
+    //     isValueObject: true,
+    //     data:[{id:0, name: 'Open'}, {id:1, name: 'Closed'}]
+    //   }
+    // },
+    // refnum:{ required: true },
+    // amount:{ type: 'number', required: true, multipleOf: 0.01 },
+    // hasTax:{ type: 'boolean' }
+  }
+
+  let searchForm = {
+    column1:{
+      'refnum':{
+        input: 'chips'
+      },
+      'date':{
+        label: "Date Range",
+        input: 'date-range'
+      }
+    },
+    column2:{
+      'amount':{
+        label: "Amount Range",
+        type: "number",
+        input: 'amount-range'
+      },
+      state:{
+        input: 'select',
+        selectOptions:{
+          isValueObject: true,
+          data:[{id:0, name: 'Open'}, {id:1, name: 'Closed'}]
+        }
       }
     },
-    refnum:{ required: true },
-    amount:{ type: 'number', required: true, multipleOf: 0.01 },
-    hasTax:{ type: 'boolean' }
+    column3:{
+      customer:{
+        input: 'select',
+        selectOptions:{
+          dataApi:{
+            key:'customer'
+          }
+        }
+      },
+    }
+
+  }
+
+  let searchFormSimp = {
+    'customer.name':{ }
   }
-  let ctx = { gridOptions, editForm }
+
+  let ctx = { gridOptions, editForm, searchForm }
   //local, not export so not exposed
   let dataApi = sessionStores.invoice
 

diff --git a/src/styles/components/_cards.scss b/src/styles/components/_cards.scss
@@ -125,3 +125,12 @@ $card-media-margin: $block-spacing !default;
     margin-bottom: $card-media-margin;
   }
 }
+
+.card-footer {
+
+  &.right {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+  }
+}
diff --git a/src/styles/components/gridz.scss b/src/styles/components/gridz.scss
@@ -52,6 +52,14 @@ $grid-border: $border;
   border: 1px solid $grid-border;
   box-sizing: content-box;
 
+  //check box
+  tr.jqgrow > td.td_cbox {
+    padding-left: 8px;
+  }
+  .ui-jqgrid-htable .ui-jqgrid-labels > th.jqgh_cbox {
+    padding-left: 4px;
+  }
+
   .ui-jqgrid-titlebar {
     height: 40px;
     line-height: 24px;
@@ -179,6 +187,9 @@ $grid-border: $border;
     line-height: 15px;
     height: 36px;
 
+    .ui-paging-info{
+      padding-right: 12px;
+    }
     .ui-pager-control{
       font-size: 12px;
     }

diff --git a/src/styles/framework7/index.scss b/src/styles/framework7/index.scss
@@ -18,6 +18,7 @@ body {
 :root {
   --f7-page-bg-color: #{cvar(body)};
   --f7-tabbar-link-inactive-color: #{cvar(text, light)};
+  --f7-input-clear-button-color: var(--color-shade-20);
 }
 
 //input mods