feat:http数据集修改提示内容

2 years ago · 3b8247c7b1
parent 8318b173f1
commit 3b8247c7b1
5 changed files with 77 additions and 83 deletions
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@ -174,7 +174,7 @@
                  <el-tooltip
                    class="item"
                    effect="light"
-                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据"
+                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据，注意：在当前数据集编辑页面缓存不生效"
                    placement="top"
                  >
                    <i
--- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
@ -198,7 +198,7 @@
            <el-row v-if="dataForm.config.requestType === 'backend'">
              <el-col :span="12">
                <el-form-item
-                  label="数据缓存"
+                  label="缓存"
                  prop="cache"
                >
                  <el-radio-group
@ -215,7 +215,7 @@
                  <el-tooltip
                    class="item"
                    effect="light"
-                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据"
+                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据，注意：在当前数据集编辑页面缓存不生效"
                    placement="top"
                  >
                    <i
@ -227,8 +227,7 @@
              </el-col>
            </el-row>
            <el-tabs
-              v-model="
-                activeName"
+              v-model="activeName"
              class="bs-el-tabs tabs-box"
            >
              <el-tab-pane
@ -466,105 +465,100 @@
                </el-form-item>
              </el-tab-pane>
            </el-tabs>
-            </span>
-            </el-form-item>
          </el-form>
-        </el-col>
-      </el-row>
-      </el-form>
-      <div
-        v-if="isEdit"
-        class="sql-config"
-      >
-        <div style="text-align: center; padding: 16px 0;">
-          <el-button
-            type="primary"
-            @click="scriptExecute()"
+          <div
+            v-if="isEdit"
+            class="sql-config"
          >
-            解析并运行
-          </el-button>
-        </div>
-      </div>
-      </el-col>
-      <el-col
-        v-if="isEdit"
-        :span="8"
-      >
-        <div class="right-setting">
-          <div class="paramConfig">
-            <div class="title-style bs-title-style">
-              动态参数
+            <div style="text-align: center; padding: 16px 0;">
              <el-button
-                type="text"
-                style="float: right;border: none;margin-top: -4px;"
-                @click="openParamsSetDialog(false)"
+                type="primary"
+                @click="scriptExecute()"
              >
-                配置
+                解析并运行
              </el-button>
            </div>
-            <div class="field-wrap bs-field-wrap bs-scrollbar">
-              <div
-                v-for="param in dataForm.config.paramsList"
-                :key="param.name"
-                class="field-item"
-                @click="openParamsSetDialog(false)"
-              >
-                <span>{{ param.name }}</span>&nbsp;<span
-                  v-show="param.remark"
-                  style="color: #909399;"
-                >
-                  ({{ param.remark }})
-                </span>
+          </div>
+        </el-col>
+        <el-col
+          v-if="isEdit"
+          :span="8"
+        >
+          <div class="right-setting">
+            <div class="paramConfig">
+              <div class="title-style bs-title-style">
+                动态参数
                <el-button
-                  class="edit_field"
                  type="text"
-                  style="float: right;border: none;margin-top: 2px;"
+                  style="float: right;border: none;margin-top: -4px;"
                  @click="openParamsSetDialog(false)"
                >
                  配置
                </el-button>
              </div>
-            </div>
-          </div>
-          <div class="structure">
-            <div class="title-style bs-title-style">
-              输出字段
-              <el-button
-                type="text"
-                style="float: right;border: none;margin-top: -4px;"
-                @click="$refs.outputFieldDialog.open()"
-              >
-                配置
-              </el-button>
-            </div>
-            <div
-              class="field-wrap bs-field-wrap bs-scrollbar"
-            >
-              <div
-                v-for="(field, key) in outputFieldList"
-                :key="key"
-                class="field-item"
-                @click="$refs.outputFieldDialog.open()"
-              >
-                <span>{{ field.fieldName }}</span>&nbsp;
-                <span
-                  v-show="field.fieldDesc"
+              <div class="field-wrap bs-field-wrap bs-scrollbar">
+                <div
+                  v-for="param in dataForm.config.paramsList"
+                  :key="param.name"
+                  class="field-item"
+                  @click="openParamsSetDialog(false)"
+                >
+                  <span>{{ param.name }}</span>&nbsp;<span
+                  v-show="param.remark"
                  style="color: #909399;"
                >
-                  ({{ field.fieldDesc }})</span>
+                    ({{ param.remark }})
+                  </span>
+                  <el-button
+                    class="edit_field"
+                    type="text"
+                    style="float: right;border: none;margin-top: 2px;"
+                    @click="openParamsSetDialog(false)"
+                  >
+                    配置
+                  </el-button>
+                </div>
+              </div>
+            </div>
+            <div class="structure">
+              <div class="title-style bs-title-style">
+                输出字段
                <el-button
-                  class="edit_field"
                  type="text"
-                  style="float: right;border: none;margin-top: 2px;"
+                  style="float: right;border: none;margin-top: -4px;"
                  @click="$refs.outputFieldDialog.open()"
                >
                  配置
                </el-button>
              </div>
+              <div
+                class="field-wrap bs-field-wrap bs-scrollbar"
+              >
+                <div
+                  v-for="(field, key) in outputFieldList"
+                  :key="key"
+                  class="field-item"
+                  @click="$refs.outputFieldDialog.open()"
+                >
+                  <span>{{ field.fieldName }}</span>&nbsp;
+                  <span
+                    v-show="field.fieldDesc"
+                    style="color: #909399;"
+                  >
+                    ({{ field.fieldDesc }})</span>
+                  <el-button
+                    class="edit_field"
+                    type="text"
+                    style="float: right;border: none;margin-top: 2px;"
+                    @click="$refs.outputFieldDialog.open()"
+                  >
+                    配置
+                  </el-button>
+                </div>
+              </div>
            </div>
          </div>
-        </div>
-      </el-col>
+        </el-col>
      </el-row>
      <div
        v-if="isEdit"
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@ -276,7 +276,7 @@
                  <el-tooltip
                    class="item"
                    effect="light"
-                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据"
+                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据，注意：在当前数据集编辑页面缓存不生效"
                    placement="top"
                  >
                    <i
--- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
@ -148,7 +148,7 @@
                  <el-tooltip
                    class="item"
                    effect="light"
-                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据"
+                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据，注意：在当前数据集编辑页面缓存不生效"
                    placement="top"
                  >
                    <i
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@ -174,7 +174,7 @@
                  <el-tooltip
                    class="item"
                    effect="light"
-                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据"
+                    content="开启缓存:会在首次调用该数据集时，将结果缓存，在接下来的十分钟内，若再次被调用则直接返回缓存中的数据，注意：在当前数据集编辑页面缓存不生效"
                    placement="top"
                  >
                    <i