Merge pull request #1152 from dev-lnk/show-when-js

moonshine-software · Aug 9, 2024 · 6dd92a8 · 6dd92a8
2 parents c19c2be + 34e565d
commit 6dd92a8
Show file tree

Hide file tree

Showing 16 changed files with 295 additions and 115 deletions.
diff --git a/resources/js/Components/FormBuilder.js b/resources/js/Components/FormBuilder.js
@@ -4,7 +4,6 @@ import request from '../Request/Core.js'
 import {dispatchEvents as de} from '../Support/DispatchEvents.js'
 import {
   getInputs,
-  isValidateShow,
   showWhenChange,
   showWhenVisibilityChange,
 } from '../Support/ShowWhen.js'
@@ -85,37 +84,44 @@ export default (name = '', initData = {}, reactive = {}) => ({
       }
     })
 
-    if (t.whenFields !== undefined) {
-      this.$nextTick(async function () {
-        let formId = t.$id('form')
-        if (formId === undefined) {
-          formId = t.$el.getAttribute('id')
-        }
+    this.whenFieldsInit()
+  },
+  whenFieldsInit(){
+    const t = this
 
-        await t.$nextTick()
+    if (! t.whenFields.length) {
+      return
+    }
 
-        const inputs = t.getInputs(formId)
+    this.$nextTick(async function () {
+      let formId = t.$id('form')
+      if (formId === undefined) {
+        formId = t.$el.getAttribute('id')
+      }
 
-        const showWhenConditions = {}
+      await t.$nextTick()
 
-        t.whenFields.forEach(field => {
-          if (
+      const inputs = t.getInputs(formId)
+
+      const showWhenFields = {}
+
+      t.whenFields.forEach(field => {
+        if (
             inputs[field.changeField] === undefined ||
             inputs[field.changeField].value === undefined
-          ) {
-            return
-          }
-          if (showWhenConditions[field.showField] === undefined) {
-            showWhenConditions[field.showField] = []
-          }
-          showWhenConditions[field.showField].push(field)
-        })
-
-        for (let key in showWhenConditions) {
-          t.showWhenVisibilityChange(showWhenConditions[key], key, inputs, formId)
+        ) {
+          return
         }
+        if (showWhenFields[field.showField] === undefined) {
+          showWhenFields[field.showField] = []
+        }
+        showWhenFields[field.showField].push(field)
       })
-    }
+
+      for (let key in showWhenFields) {
+        t.showWhenVisibilityChange(showWhenFields[key], key, inputs, formId)
+      }
+    })
   },
   precognition() {
     const form = this.$el
@@ -276,8 +282,6 @@ export default (name = '', initData = {}, reactive = {}) => ({
 
   showWhenVisibilityChange,
 
-  isValidateShow,
-
   getInputs,
 })
 

diff --git a/resources/js/Components/TableBuilder.js b/resources/js/Components/TableBuilder.js
@@ -69,6 +69,12 @@ export default (
 
     this.table.querySelector('tbody').appendChild(this.lastRow.cloneNode(true))
 
+    const form = this.table.closest('from[data-component]')
+    if(form) {
+      const formName = form.getAttribute('data-component')
+      this.$dispatch('show_when_refresh:' + formName)
+    }
+
     if (!force && this.reindex) {
       this.resolveReindex()
     }

diff --git a/resources/js/Support/Forms.js b/resources/js/Support/Forms.js
@@ -1,4 +1,4 @@
-import {inputFieldName, inputGeValue} from './ShowWhen.js'
+import {inputFieldName, inputGetValue} from './ShowWhen.js'
 
 export function filterAttributeStartsWith(data, startsWith) {
   const filtered = {}
@@ -97,7 +97,7 @@ export function crudFormQuery(formElements = null) {
       !name.startsWith('_') &&
       !name.startsWith('hidden_')
     ) {
-      values[inputFieldName(name)] = inputGeValue(element)
+      values[inputFieldName(name)] = inputGetValue(element)
     }
   })