tianheng-ui 0.1.49 → 0.1.50

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -216,9 +216,9 @@ export default {
           trigger: "change"
         });
       }
-      this.hendleRemoteData(item);
+      this.hendleElementRemoteData(item);
     },
-    hendleRemoteData(item) {
+    hendleElementRemoteData(item) {
       if (!item.options.remote) return;
       if (item.type === "upload" || item.type === "button") return;
       const api = this.formConfig.config.network[item.options.remoteFunc];
@@ -233,25 +233,38 @@ export default {
       for (let e of api.inParams) {
         const value =
           getProperty(this.models, e.pAlias) ||
-          getProperty(this.query, e.pAlias);
-        setProperty(params, e.pAlias, value || null);
+          getProperty(this.query, e.pAlias) ||
+          null;
+        setProperty(params, e.pAlias, value);
       }
       if (api.needPage) {
         params.pageNum = 1;
         params.pageSize = 20;
       }
-      if (["POST", "PUT"].includes(api.method)) requestConfig.data = params;
-      else requestConfig.params = requestConfig;
+      if (["get", "delete"].includes(api.method.toLowerCase()))
+        requestConfig.params = params;
+      else requestConfig.data = params;
 
       this.axios(requestConfig).then(res => {
+        const props = {
+          value: item.options.props.value || "value",
+          label: item.options.props.label || "label",
+          children: item.options.props.children || "children"
+        };
+        const initOptions = list => {
+          return list.map(element => {
+            const dic = {
+              value: element[props.value],
+              label: element[props.label]
+            };
+            if (element[props.children] && element[props.children].length) {
+              dic.children = initOptions(element[props.children]);
+            }
+            return dic;
+          });
+        };
         const resultData = res.data.records ? res.data.records : res.data;
-        item.options.remoteOptions = resultData.map(element => {
-          return {
-            value: element[item.options.props.value || "value"],
-            label: element[item.options.props.label || "label"],
-            children: element[item.options.props.children || "children"]
-          };
-        });
+        item.options.remoteOptions = initOptions(resultData);
       });
     },
     handleButtonSubmit(val) {

package/packages/FormMaking/WidgetConfig.vue

@@ -177,7 +177,7 @@
                 <el-tooltip
                   slot="label"
                   effect="light"
-                  content="开启后，列表接口值修改，会触发 remote-params 回调，用于从服务器查询字段，"
+                  content="开启后，字段接口值修改，会触发 remote-params 回调，用于从服务器查询字段"
                   placement="top"
                 >
                   <span style="color: #409EFF;">远程字段</span>

package/packages/TableMaking/util/index.js

@@ -484,3 +484,34 @@ export const deepMerge = (target, other) => {
   }
   return target;
 };
+
+// 链式读取对象属性
+export const getProperty = (obj = {}, str = "") => {
+  let dic = deepClone(obj);
+  const props = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+  const keys = props.split(".");
+  for (const key of keys) {
+    dic = dic[key] || "";
+  }
+  return dic;
+};
+
+// 链式设置对象属性
+export const setProperty = (obj = {}, str = "", value = "", isClone) => {
+  let dic = isClone ? deepClone(obj) : obj;
+  let propValue = "";
+  const props = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+  const keys = props.split(".");
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    if (keys.length === 1) {
+      dic[key] = value;
+    } else if (i === keys.length - 1) {
+      propValue[key] = value;
+    } else {
+      if (!dic[key]) dic[key] = {};
+      propValue = dic[key];
+    }
+  }
+  return dic;
+};

package/packages/TableMaking/widgetConfig.vue

@@ -79,7 +79,7 @@
               <el-tooltip
                 slot="label"
                 effect="light"
-                content="开启后，列表接口值修改，会触发 remote-params 回调，用于从服务器查询字段，"
+                content="开启后，列表接口值修改，会触发 remote-params 回调，用于从服务器查询字段"
                 placement="top"
               >
                 <span style="color: #409EFF;">远程字段</span>
@@ -724,6 +724,9 @@ export default {
     "config.table.mounted.api"(val) {
       this.handleFieldsApiChange(val, true);
     },
+    "config.table.fields.remote"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.table.mounted.api, true);
+    },
     "config.tools.add.show"(bool) {
       if (bool) this.handleFieldsApiChange(this.config.tools.add.api);
     },
@@ -817,8 +820,8 @@ export default {
 
       if (this.config.table.fields.remote) {
         const callback = res => {
-          api.inParams = res.inParams;
-          api.outParams = res.outParams;
+          api.inParams = deepClone(res.inParams);
+          api.outParams = deepClone(res.outParams);
           initParams(api.inParams, null, false);
           initParams(api.outParams, null, false);
           if (isFields) {
@@ -830,8 +833,8 @@ export default {
         };
         this.$emit("remote-params", apiId, callback);
       } else {
-        initParams(api.inParams, null, false);
-        initParams(api.outParams, null, false);
+        initParams(deepClone(api.inParams), null, false);
+        initParams(deepClone(api.outParams), null, false);
         if (isFields) {
           this.fieldsData.inParams = deepClone(api.inParams || []);
           initParams(this.fieldsData.inParams, null, true);