From a1e9b18a4dbfd21e1bf4d5cb60974ac2f0115efd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 五月 2025 15:18:44 +0800
Subject: [PATCH] 2025-05-30

---
 src/tabviews/zshare/mutilform/mkSelect/index.jsx |   60 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/tabviews/zshare/mutilform/mkSelect/index.jsx b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
index 821fb89..7371348 100644
--- a/src/tabviews/zshare/mutilform/mkSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
@@ -18,12 +18,11 @@
         value = []
       }
     } else if (value) {
-      let option = null
-      option= config.oriOptions[0]
-      if (typeof(value) === 'string' && option && typeof(option.value) === 'number') {
-        value = +value
-        if (isNaN(value)) {
-          value = config.initval
+      let option = config.oriOptions[0]
+
+      if (option && typeof(option.value) !== typeof(value)) {
+        if (typeof(option.value) === 'number' && !isNaN(value)) {
+          value = +value
         }
       }
     }
@@ -57,20 +56,23 @@
         options: fromJS(nextProps.config.options).toJS()
       })
 
-      if (typeof(config.initval) === 'string' && config.initval.indexOf('$first') > -1) {
+      let option = nextProps.config.oriOptions[0]
+      if (config.$first) {
         this.setState({
           value: nextProps.config.initval,
         })
-      } else {
-        let option = null
-        option= nextProps.config.oriOptions[0]
-        if (option && typeof(option.value) === 'number') {
-          let val = +value
-          if (!isNaN(val)) {
-            this.setState({
-              value: val
-            })
-          }
+        if (config.linkFields && nextProps.config.initval) {
+          config.linkFields.forEach((m, i) => {
+            setTimeout(() => {
+              MKEmitter.emit('mkFP', m.uuid, nextProps.config.initval, 0)
+            }, (i + 1) * 70)
+          })
+        }
+      } else if (option && typeof(option.value) !== typeof(value)) {
+        if (typeof(option.value) === 'number' && !isNaN(value)) {
+          this.setState({
+            value: +value
+          })
         }
       }
     }
@@ -84,12 +86,15 @@
     MKEmitter.removeListener('mkFC', this.mkFormFocus)
   }
 
-  mkFormFocus = (type, uuid) => {
+  mkFormFocus = (type, uuid, val, level) => {
     if (uuid !== this.props.config.uuid) return
-    if (type !== 'focus') return
-
-    let _div = document.getElementById(uuid)
-    _div && _div.click && _div.click()
+    if (type === 'focus') {
+      let _div = document.getElementById(uuid)
+      _div && _div.click && _div.click()
+    } else if (type === 'input' && (!level || level < 10)) {
+      let _level = level || 1
+      this.selectChange(val, _level++)
+    }
   }
 
   mkFormHandle = (uuid, parentId, level) => {
@@ -128,7 +133,7 @@
     }
   }
 
-  selectChange = (val) => {
+  selectChange = (val, level) => {
     const { config } = this.state
     let other = {}
 
@@ -137,7 +142,7 @@
       option && config.subFields.forEach((n, i) => {
         other[n.field] = option[n.field]
         setTimeout(() => {
-          MKEmitter.emit('mkFC', 'input', n.uuid, option[n.field])
+          MKEmitter.emit('mkFC', 'input', n.uuid, option[n.field], level)
         }, i * 5)
       })
     }
@@ -154,12 +159,13 @@
       if (config.enter === 'tab') {
         MKEmitter.emit('mkFC', 'focus', config.tabUuid)
       } else if (config.enter === 'sub') {
+        config.tabUuid && MKEmitter.emit('mkFC', 'focus', config.tabUuid)
         if (config.linkFields || config.subFields || config.controlFields) {
           setTimeout(() => {
-            this.props.onSubmit()
+            this.props.onSubmit(config.tabUuid, config.errTabUuid)
           }, 1000)
         } else {
-          this.props.onSubmit()
+          this.props.onSubmit(config.tabUuid, config.errTabUuid)
         }
       }
     })
@@ -181,7 +187,7 @@
           value={value}
           dropdownMatchSelectWidth={config.dropdown !== 'false'}
           filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
-          onSelect={this.selectChange}
+          onSelect={(val) => this.selectChange(val)}
           onChange={(val) => val === undefined && this.selectChange('')}
           disabled={config.readonly}
         >

--
Gitblit v1.8.0