修改指令集可视化功能；

zhangzzzz
1 parent 63560780
Showing 2 changed files with 14 additions and 6 deletions
src/components/Common/CommonInstructSet.js
src/components/Common/InstructSetSetting/index.js
@@ -1229,7 +1229,10 @@ const handleOpenSql = async (props, instruct) =&gt; {
   } = props;
   const { userinfo } = app;
-  const { data = [] } = instruct;
+  let { data = [] } = instruct;
+  if (!data.length) {
+    data = [instruct];
+  }
   let result = {};
@@ -1365,7 +1368,10 @@ const handleGetSqlValue = async (props, data, srcDatasetRow = {}) =&gt; {
 /************************* 执行sql exesql ************************/
 // 执行sql -> 暂存sql，全部执行完后一起执行
 const handleExeSql = (props, instruct) => {
-  const { data = [] } = instruct;
+  let { data = [] } = instruct;
+  if (!data.length) {
+    data = [instruct];
+  }
   const result = [];
   data.forEach(item => {
     const { sql, srcDataset } = item;
@@ -14,7 +14,7 @@ const InstructSetSetting = (props = {}) =&gt; {
   const { instructSetSettingVisible } = props;
   if (!instructSetSettingVisible) return "";
-  const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId, slave0Data, app } = props;
+  const { name, sFieldName, onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId, slave0Data, app } = props;
   const { showName, sName } = showConfig;
   const { currentPane } = app;
   const { key, parentPaneKey } = currentPane;
@@ -97,12 +97,14 @@ const InstructSetSetting = (props = {}) =&gt; {
     const { command, data } = event.data;
     if (command === "initData") {
-      if (!bConfigured && props.name !== "master") return;
+      // if (!bConfigured && props.name !== "master") return;
       iframeRef.current.contentWindow.postMessage(
         {
+          tableName: name,
+          sFieldName,
           command: "initData",
-          value: instructSet.change || instructSet.blur || (instructSet ? [instructSet] : []),
+          value: instructSet.change || instructSet.blur || (commonUtils.isNotEmptyObject(instructSet) ? [instructSet] : []),
           slave0Data,
           configList: configList.current,
           srcModelsList: srcModelsList.current,
@@ -177,7 +179,7 @@ const InstructSetSetting = (props = {}) =&gt; {
               >
                 格式化
               </Button>
-              <Button type="primary" onClick={() => props.onSaveData(JSON.stringify(JSON.parse(value.replace(/[\r\n]/g, ""))))}>
+              <Button type="primary" onClick={() => props.onSaveData(value ? JSON.stringify(JSON.parse(value.replace(/[\r\n]/g, ""))) : "")}>
                 保存
               </Button>
               <Button type="primary" onClick={() => setMode("config")}>