tianheng-ui 0.1.76 → 0.1.78

package/packages/TableMaking/widgetGuide.vue

@@ -27,18 +27,7 @@
               <el-radio-button label="api">接口导入</el-radio-button>
             </el-radio-group>
           </el-form-item>
-          <el-form-item>
-            <el-tooltip
-              slot="label"
-              effect="light"
-              content="开启后，选择数据接口会触发 remote-params 回调，用于从服务器查询字段"
-              placement="top"
-            >
-              <span style="color: #409EFF;">远程字段</span>
-            </el-tooltip>
-            <el-switch v-model="config.table.fields.remote"> </el-switch>
-          </el-form-item>
-          <el-form-item>
+          <el-form-item v-if="config.table.fields.type==='api'">
             <el-tooltip
               slot="label"
               effect="light"
@@ -70,6 +59,17 @@
               placeholder="请输入"
             ></el-input>
           </el-form-item>
+          <el-form-item>
+            <el-tooltip
+              slot="label"
+              effect="light"
+              content="开启后，选择数据接口会触发 remote-params 回调，用于从服务器获取字段"
+              placement="top"
+            >
+              <span style="color: #409EFF;">远程字段</span>
+            </el-tooltip>
+            <el-switch v-model="config.table.fields.remote"> </el-switch>
+          </el-form-item>
           <el-form-item label="是否分页">
             <el-switch v-model="config.table.pageInfo.show"> </el-switch>
           </el-form-item>
@@ -111,19 +111,14 @@
           </el-tabs>
         </div>
         <div v-show="step === 2">
-          <el-form-item label="">
-            <div
-              class="tools-item"
-              v-for="item in Object.values(config.tools)"
-              :key="item.type"
-            >
-              <el-checkbox
-                v-model="item.show"
-                :label="item.name"
-                border
-              ></el-checkbox>
-            </div>
-          </el-form-item>
+          <el-checkbox
+            class="tools-item"
+            v-for="item in Object.values(config.tools)"
+            v-model="item.show"
+            :label="item.name"
+            :key="item.type"
+            border
+          ></el-checkbox>
         </div>
       </el-form>
     </div>
@@ -234,7 +229,9 @@ export default {
     padding-top: 10px;
 
     .tools-item {
-      margin-bottom: 10px;
+      display: inline-block;
+      margin: 10px;
+      width: calc(25% - 20px);
     }
   }
   .footer {

package/packages/TableMaking/widgetTable.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="widgetTable">
-    <div class="table-title">查询字段</div>
+    <div class="table-title">
+      <span>查询字段</span>
+      <el-button
+        v-if="config.table.fields.type === 'custom'"
+        style="float:right;padding:0px 10px;"
+        type="text"
+        @click="handleParamsAdd('in')"
+        >新增</el-button
+      >
+    </div>
     <div
       class="tableList searchList"
       v-loading="!config.search.show"
@@ -95,7 +104,16 @@
       </draggable>
       <div v-else class="search-content"></div>
     </div>
-    <div class="table-title">列表字段</div>
+    <div class="table-title">
+      <span>列表字段</span>
+      <el-button
+        v-if="config.table.fields.type === 'custom'"
+        style="float:right;padding:0px 10px;"
+        type="text"
+        @click="handleParamsAdd('out')"
+        >新增</el-button
+      >
+    </div>
     <div class="tableList" style="height: calc(100% - 350px);">
       <div class="table-item table-header">
         <div class="table-item-custom">拖动</div>
@@ -246,6 +264,20 @@ export default {
     handleDialogAffirm() {
       this.dialog.data.staticData = this.codeEditorValue;
       this.dialog = { visible: false, title: "", data: null };
+    },
+    handleParamsAdd(action) {
+      if (action === "in") {
+        this.config.search.options.push({
+          alias: "",
+          align: "left",
+          elType: "input",
+          id: new Date().getTime(),
+          javaType: "String",
+          label: "字段名",
+          pAlias: "",
+          prop: ""
+        });
+      }
     }
   }
 };
@@ -259,8 +291,10 @@ export default {
   overflow-y: overlay;
 
   .table-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     height: 25px;
-    line-height: 25px;
   }
   .searchList {
     margin: 10px 0;