tianheng-ui 0.1.62 → 0.1.63

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.1.62",
+  "version": "0.1.63",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/FormMaking/GenerateForm.vue

@@ -285,8 +285,9 @@ export default {
         this.models = Object.assign(this.models, resultData);
       });
     },
-    handleButtonSubmit(val) {
-      const api = this.formConfig.config.network[val];
+    handleButtonSubmit(element) {
+      console.log(element);
+      const api = this.formConfig.config.network[element.options.remoteFunc];
       if (!api) return this.$message.warning("未知的接口，请检查配置信息");
 
       let params = {};
@@ -318,9 +319,15 @@ export default {
 
       this.$refs.generateForm.validate(valid => {
         if (!valid) return;
-        this.axios(requestConfig).then(res => {
-          this.$emit("button-submit", requestConfig);
-        });
+        element.options.loading = true;
+        this.axios(requestConfig)
+          .then(res => {
+            element.options.loading = false;
+            this.$emit("button-submit", element);
+          })
+          .catch(err => {
+            element.options.loading = false;
+          });
       });
     },
     getData() {

package/packages/FormMaking/WidgetConfig.vue

@@ -172,45 +172,36 @@
                 <el-radio-button label="api">接口导入</el-radio-button>
               </el-radio-group>
             </el-form-item>
-            <template v-if="config.fields.type === 'api'">
-              <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.fields.remote"> </el-switch>
-              </el-form-item>
-              <el-form-item prop="fields.api" required>
-                <el-tooltip
-                  slot="label"
-                  effect="light"
-                  content="使用接口的出参配置可选字段"
-                  placement="top"
-                >
-                  <span style="color: #409EFF;">字段接口</span>
-                </el-tooltip>
-                <el-select
-                  v-model="config.fields.api"
-                  style="width:100%"
-                  placeholder="请选择"
-                  no-data-text="暂无接口，请前往【数据源模块】创建"
-                  clearable
-                  filterable
+            <el-form-item
+              v-if="config.fields.type === 'api'"
+              prop="fields.api"
+              required
+            >
+              <el-tooltip
+                slot="label"
+                effect="light"
+                content="使用接口的出参配置可选字段"
+                placement="top"
+              >
+                <span style="color: #409EFF;">字段接口</span>
+              </el-tooltip>
+              <el-select
+                v-model="config.fields.api"
+                style="width:100%"
+                placeholder="请选择"
+                no-data-text="暂无接口，请前往【数据源模块】创建"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in apiOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 >
-                  <el-option
-                    v-for="item in apiOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="表单标题" prop="title" required>
               <el-input
                 v-model="config.title"
@@ -221,6 +212,17 @@
             <el-form-item label="表单宽度">
               <el-input v-model="config.width"></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.fields.remote"> </el-switch>
+            </el-form-item>
             <el-form-item label="组件库">
               <el-radio-group v-model="config.ui">
                 <el-radio-button label="element">Element</el-radio-button>
@@ -248,9 +250,10 @@
               <el-select
                 v-model="config.mounted.api"
                 value-key="id"
-                clearable
                 placeholder="请选择数据方法"
                 no-data-text="暂无接口，请前往【接口模块】创建"
+                clearable
+                filterable
               >
                 <el-option
                   v-for="item in apiOptions"
@@ -588,12 +591,10 @@ export default {
         return;
       }
 
-      const initParams = (paramsList, pAlias, bool) => {
+      const initParams = (paramsList, pAlias) => {
         paramsList.forEach(item => {
-          if (bool) {
-            item.elType = "input";
-            item.align = "left";
-          }
+          item.elType = "input";
+          item.align = "left";
           item.pAlias = pAlias ? `${pAlias}.${item.alias}` : item.alias;
           if (item.children && item.children.length) {
             initParams(item.children, item.pAlias);
@@ -605,25 +606,25 @@ export default {
         const callback = res => {
           api.inParams = deepClone(res.inParams);
           api.outParams = deepClone(res.outParams);
-          initParams(api.inParams, null, false);
-          initParams(api.outParams, null, false);
+          initParams(api.inParams);
+          initParams(api.outParams);
 
           if (isFields) {
             this.fieldsData.inParams = deepClone(res.inParams || []);
-            initParams(this.fieldsData.inParams, null, true);
+            initParams(this.fieldsData.inParams);
             this.fieldsData.outParams = deepClone(res.outParams || []);
-            initParams(this.fieldsData.outParams, null, true);
+            initParams(this.fieldsData.outParams);
           }
         };
         this.$emit("remote-params", apiId, callback);
-      } else {
-        initParams(api.inParams, null, false);
-        initParams(api.outParams, null, false);
+      } else if (api.inParams) {
+        initParams(api.inParams);
+        initParams(api.outParams);
         if (isFields) {
           this.fieldsData.inParams = deepClone(api.inParams || []);
-          initParams(this.fieldsData.inParams, null, true);
+          initParams(this.fieldsData.inParams);
           this.fieldsData.outParams = deepClone(api.outParams || []);
-          initParams(this.fieldsData.outParams, null, true);
+          initParams(this.fieldsData.outParams);
         }
       }
     },

package/packages/FormMaking/custom/config.js

@@ -807,7 +807,7 @@ export const baseConfig = {
     fields: {
       type: "api",
       api: "",
-      remote: false
+      remote: true
     },
     ui: "element",
     title: "",

package/packages/FormMaking/custom/mixins/index.js

@@ -81,8 +81,7 @@ export const eventMixin = {
         }
       }
       if (this.widget.type === "button") {
-        this.$emit("button-submit", this.widget.options.remoteFunc);
-        // this.hendleRemoteData();
+        this.$emit("button-submit", this.widget);
         return;
       }
     },

package/packages/TableMaking/custom/config.js

@@ -8,7 +8,7 @@ export const search = {
 export const table = {
   fields: {
     type: "api",
-    remote: false
+    remote: true
   },
   mounted: { api: "" },
   options: [],

package/packages/TableMaking/widgetConfig.vue

@@ -75,17 +75,6 @@
                 <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 required prop="table.mounted.api">
               <el-tooltip
                 slot="label"
@@ -119,6 +108,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.sequence"> </el-switch>
             </el-form-item>
@@ -175,10 +175,16 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="分页参数">
-                <el-input placeholder="请输入" v-model="config.table.pageInfo.options.currentPageName">
+                <el-input
+                  placeholder="请输入"
+                  v-model="config.table.pageInfo.options.currentPageName"
+                >
                   <template slot="prepend">页码</template>
                 </el-input>
-                <el-input placeholder="请输入" v-model="config.table.pageInfo.options.pageSizeName">
+                <el-input
+                  placeholder="请输入"
+                  v-model="config.table.pageInfo.options.pageSizeName"
+                >
                   <template slot="prepend">条数</template>
                 </el-input>
               </el-form-item>
@@ -817,12 +823,10 @@ export default {
         return;
       }
 
-      const initParams = (paramsList, pAlias, bool) => {
+      const initParams = (paramsList, pAlias) => {
         paramsList.forEach(item => {
-          if (bool) {
-            item.elType = "input";
-            item.align = "left";
-          }
+          item.elType = "input";
+          item.align = "left";
           item.pAlias = pAlias ? `${pAlias}.${item.alias}` : item.alias;
           if (item.children && item.children.length) {
             initParams(item.children, item.pAlias);
@@ -834,13 +838,13 @@ export default {
         const callback = res => {
           api.inParams = deepClone(res.inParams);
           api.outParams = deepClone(res.outParams);
-          initParams(api.inParams, null, false);
-          initParams(api.outParams, null, false);
+          initParams(api.inParams);
+          initParams(api.outParams);
           if (isFields) {
             this.fieldsData.inParams = deepClone(res.inParams || []);
-            initParams(this.fieldsData.inParams, null, true);
+            initParams(this.fieldsData.inParams);
             this.fieldsData.outParams = deepClone(res.outParams || []);
-            initParams(this.fieldsData.outParams, null, true);
+            initParams(this.fieldsData.outParams);
           }
         };
         this.$emit("remote-params", apiId, callback);
@@ -849,9 +853,9 @@ export default {
         initParams(api.outParams, null, false);
         if (isFields) {
           this.fieldsData.inParams = deepClone(api.inParams || []);
-          initParams(this.fieldsData.inParams, null, true);
+          initParams(this.fieldsData.inParams);
           this.fieldsData.outParams = deepClone(api.outParams || []);
-          initParams(this.fieldsData.outParams, null, true);
+          initParams(this.fieldsData.outParams);
         }
       }
     },