Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi

Min
2 parents 908a02ab 9061710b
Showing 1 changed file with 10 additions and 1 deletions
src/components/Common/InstructSetSetting/index.js
@@ -99,12 +99,21 @@ const InstructSetSetting = (props = {}) =&gt; {
     if (command === "initData") {
       // if (!bConfigured && props.name !== "master") return;
+      let value = instructSet;
+      if (commonUtils.isEmptyObject(instructSet)) {
+        value = [];
+      } else if (!Array.isArray(instructSet)) {
+        value = [instructSet];
+      }
+
+      value = instructSet.change || instructSet.blur || value;
+
       iframeRef.current.contentWindow.postMessage(
         {
           tableName: name,
           sFieldName,
           command: "initData",
-          value: instructSet.change || instructSet.blur || (commonUtils.isNotEmptyObject(instructSet) ? [instructSet] : []),
+          value,
           slave0Data,
           configList: configList.current,
           srcModelsList: srcModelsList.current,