glib-web 4.13.1 → 4.14.1

package/actions/logics/set.js

@@ -40,12 +40,12 @@ const sum = function (...args) {
 jsonLogic.add_operation("sum", sum);
 
 const count = function (args) {
-  return args.length;
+  return [args].flat().length;
 };
 jsonLogic.add_operation("count", count);
 
 const countNonNull = function (args) {
-  return args.reduce((accumulator, currentValue) => {
+  return [args].flat().reduce((accumulator, currentValue) => {
     if (isPresent(currentValue)) {
       accumulator++;
     }

package/components/composable/form.js

@@ -97,6 +97,7 @@ function useGlibInput({ props }) {
   // save fieldModel to spec so data still intact even if component unmounted
   const instance = getCurrentInstance();
   onBeforeUpdate(() => {
+    if (!instance.ctx.spec) return;
     instance.ctx.spec.value = instance.ctx.fieldModel;
   });
 

package/components/fields/checkGroup.vue

@@ -58,11 +58,7 @@ export default defineComponent({
   },
   computed: {
     values() {
-      const opts = this.options.map((item) => item.value).filter((item) => isPresent(item));
-      return opts.reduce((prev, curr) => {
-        if (this.fieldModel.includes(curr)) prev.push(curr);
-        return prev;
-      }, []);
+      return this.fieldModel || [];
     }
   }
 });

package/components/fields/dynamicSelect.vue

@@ -70,6 +70,14 @@
           <v-list-item-title>Load More</v-list-item-title>
         </v-list-item-content>
       </v-list-item> -->
+
+      <template v-slot:prepend-item>
+        <common-responsive v-if="spec.header" :spec="spec.header" />
+      </template>
+
+      <template v-slot:append-item>
+        <common-responsive v-if="spec.footer" :spec="spec.footer" />
+      </template>
     </v-autocomplete>
 
     <input v-for="(item, index) in values" :key="index" type="hidden" :name="spec.name" :value="item.value" />

package/components/mixins/styles.js

@@ -5,6 +5,7 @@ import Action from "../../action";
 import { triggerOnChange } from "../composable/form";
 import { realComponent } from "../helper";
 import set from "lodash.set";
+import merge from "lodash.merge";
 const NUMBER_PRECISION = 2;
 const isNeedToBeFixed = (val, component) => {
   return component.type == 'number' && !Number.isInteger(val) && Number.isFinite(val);
@@ -20,9 +21,9 @@ const jsonLogicData = (data) => {
     if (path.includes('.')) {
       const obj = {};
       set(obj, path, value);
-      return Object.assign({}, prev, obj);
+      return merge(prev, obj);
     } else {
-      return Object.assign({}, prev, { [path]: value });
+      return merge(prev, { [path]: value });
     }
   }, {});
 };
@@ -306,6 +307,7 @@ export default {
       vm._submitWhenNotDisplayed = data.submitWhenNotDisplayed;
 
       if (!vm.spec.tooltip && data.tooltip) {
+        console.log(data);
         this.initTooltip();
       }
 

package/cypress/e2e/glib-web/display.cy.ts

@@ -18,8 +18,8 @@ Form Data:
   "chip_group": "option2",
   "radio_group": "option3",
   "check_group": [
-    "option1",
-    "option3"
+    "option3",
+    "option1"
   ],
   "text": "John Doe",
   "textarea": "Lorem ipsum et dumet bla bla bla..."
@@ -52,8 +52,8 @@ Form Data:
   "chip_group": "option2",
   "radio_group": "option3",
   "check_group": [
-    "option1",
-    "option3"
+    "option3",
+    "option1"
   ],
   "text": "Jack Doe",
   "textarea": "Lorem ipsum et dumet bla bla bla..."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "4.13.1",
+  "version": "4.14.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -48,4 +48,4 @@
     "prettier": "^1.18.2",
     "typescript": "^4.9.5"
   }
-}
+}