tianheng-ui 0.1.81 → 0.1.84

package/packages/FormMaking/util/index.js

@@ -1,98 +1,98 @@
-export const loadJs = url => {
-  return new Promise((resolve, reject) => {
-    const script = document.createElement("script");
-    script.src = url;
-    script.type = "text/javascript";
-    document.body.appendChild(script);
-    script.onload = () => {
-      resolve();
-    };
-  });
-};
-
-export const loadCss = url => {
-  return new Promise((resolve, reject) => {
-    const link = document.createElement("link");
-    link.rel = "stylesheet";
-    link.href = url;
-    document.head.appendChild(link);
-    link.onload = () => {
-      resolve();
-    };
-  });
-};
-
-export const generateUUID = () => {
-  var d = new Date().getTime();
-  var uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(
-    c
-  ) {
-    var r = (d + Math.random() * 16) % 16 | 0;
-    d = Math.floor(d / 16);
-    return (c == "x" ? r : (r & 0x7) | 0x8).toString(16);
-  });
-  return uuid;
-};
-
-export const inputTypeDict = val => {
-  const dict = {
-    email: "email",
-    url: "url"
-  };
-  return dict[val] || "text";
-};
-
-export const deepClone = (obj, clone) => {
-  //判断拷贝的要进行深拷贝的是数组还是对象，是数组的话进行数组拷贝，对象的话进行对象拷贝
-  const toString = Object.prototype.toString;
-  toString.call(obj) === "[object Array]"
-    ? (clone = clone || [])
-    : (clone = clone || {});
-  for (const i in obj) {
-    if (typeof obj[i] === "object" && obj[i] !== null) {
-      // 要考虑深复制问题了
-      if (Array.isArray(obj[i])) {
-        // 这是数组
-        clone[i] = [];
-      } else {
-        // 这是对象
-        clone[i] = {};
-      }
-      deepClone(obj[i], clone[i]);
-    } else {
-      clone[i] = obj[i];
-    }
-  }
-  return clone;
-};
-
-// 链式读取对象属性
-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;
-};
+export const loadJs = url => {
+  return new Promise((resolve, reject) => {
+    const script = document.createElement("script");
+    script.src = url;
+    script.type = "text/javascript";
+    document.body.appendChild(script);
+    script.onload = () => {
+      resolve();
+    };
+  });
+};
+
+export const loadCss = url => {
+  return new Promise((resolve, reject) => {
+    const link = document.createElement("link");
+    link.rel = "stylesheet";
+    link.href = url;
+    document.head.appendChild(link);
+    link.onload = () => {
+      resolve();
+    };
+  });
+};
+
+export const generateUUID = () => {
+  var d = new Date().getTime();
+  var uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(
+    c
+  ) {
+    var r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c == "x" ? r : (r & 0x7) | 0x8).toString(16);
+  });
+  return uuid;
+};
+
+export const inputTypeDict = val => {
+  const dict = {
+    email: "email",
+    url: "url"
+  };
+  return dict[val] || "text";
+};
+
+export const deepClone = (obj, clone) => {
+  //判断拷贝的要进行深拷贝的是数组还是对象，是数组的话进行数组拷贝，对象的话进行对象拷贝
+  const toString = Object.prototype.toString;
+  toString.call(obj) === "[object Array]"
+    ? (clone = clone || [])
+    : (clone = clone || {});
+  for (const i in obj) {
+    if (typeof obj[i] === "object" && obj[i] !== null) {
+      // 要考虑深复制问题了
+      if (Array.isArray(obj[i])) {
+        // 这是数组
+        clone[i] = [];
+      } else {
+        // 这是对象
+        clone[i] = {};
+      }
+      deepClone(obj[i], clone[i]);
+    } else {
+      clone[i] = obj[i];
+    }
+  }
+  return clone;
+};
+
+// 链式读取对象属性
+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/network/axios.js

@@ -1,88 +1,88 @@
-import axios from "axios";
-import Log from "../util/Log";
-import appConfig from "../config/index";
-import { Notification } from "element-ui";
-
-export const init = baseConfig => {
-  // 创建axios实例
-  const Axios = axios.create({
-    baseURL: baseConfig.baseUrl,
-    timeout: 60000 // 请求超时时间
-    // withCredentials: true, //允许携带cookie
-  });
-
-  // 添加请求拦截器
-  Axios.interceptors.request.use(
-    config => {
-      const info = sessionStorage.getItem(appConfig.storageKeys.oauthConfig);
-      if (info) {
-        const oauthInfo = JSON.parse(info);
-        config.baseURL = oauthInfo.baseUrl;
-        config.headers["Authorization"] = oauthInfo.token;
-      }
-      if (baseConfig.headers) {
-        config.headers = Object.assign(config.headers, baseConfig.headers);
-      }
-      return config;
-    },
-    error => {
-      Promise.reject(error);
-    }
-  );
-
-  // 添加响应拦截器
-  Axios.interceptors.response.use(
-    response => {
-      const code = response.status;
-      if (code < 200 || code > 300) {
-        Notification.error({
-          title: response.message
-        });
-        return Promise.reject("error");
-      }
-
-      const dataCode = response.data.code;
-      if (dataCode && dataCode !== 200) {
-        Notification.error({
-          title: response.data.message
-        });
-        return Promise.reject("error");
-      }
-
-      if (baseConfig.debug) {
-        Log.prettyPrimary("Request Url:", response.request.responseURL);
-        Log.prettySuccess("Request Res:", response);
-      }
-
-      return response.data;
-    },
-    error => {
-      let code = 0;
-      try {
-        code = error.response.data.status;
-      } catch (e) {
-        if (error.toString().indexOf("Error: timeout") !== -1) {
-          Notification.error({
-            title: "网络请求超时",
-            duration: 5000
-          });
-          return Promise.reject(error);
-        }
-      }
-      if (code) {
-        const errorMsg = error.response.data.message;
-        Notification.error({
-          title: errorMsg || "未知错误",
-          duration: 5000
-        });
-      } else {
-        Notification.error({
-          title: "接口请求失败",
-          duration: 5000
-        });
-      }
-      return Promise.reject(error);
-    }
-  );
-  return Axios;
-};
+import axios from "axios";
+import Log from "../util/Log";
+import appConfig from "../config/index";
+import { Notification } from "element-ui";
+
+export const init = baseConfig => {
+  // 创建axios实例
+  const Axios = axios.create({
+    baseURL: baseConfig.baseUrl,
+    timeout: 60000 // 请求超时时间
+    // withCredentials: true, //允许携带cookie
+  });
+
+  // 添加请求拦截器
+  Axios.interceptors.request.use(
+    config => {
+      const info = sessionStorage.getItem(appConfig.storageKeys.oauthConfig);
+      if (info) {
+        const oauthInfo = JSON.parse(info);
+        config.baseURL = oauthInfo.baseUrl;
+        config.headers["Authorization"] = oauthInfo.token;
+      }
+      if (baseConfig.headers) {
+        config.headers = Object.assign(config.headers, baseConfig.headers);
+      }
+      return config;
+    },
+    error => {
+      Promise.reject(error);
+    }
+  );
+
+  // 添加响应拦截器
+  Axios.interceptors.response.use(
+    response => {
+      const code = response.status;
+      if (code < 200 || code > 300) {
+        Notification.error({
+          title: response.message
+        });
+        return Promise.reject("error");
+      }
+
+      const dataCode = response.data.code;
+      if (dataCode && dataCode !== 200) {
+        Notification.error({
+          title: response.data.message
+        });
+        return Promise.reject("error");
+      }
+
+      if (baseConfig.debug) {
+        Log.prettyPrimary("Request Url:", response.request.responseURL);
+        Log.prettySuccess("Request Res:", response);
+      }
+
+      return response.data;
+    },
+    error => {
+      let code = 0;
+      try {
+        code = error.response.data.status;
+      } catch (e) {
+        if (error.toString().indexOf("Error: timeout") !== -1) {
+          Notification.error({
+            title: "网络请求超时",
+            duration: 5000
+          });
+          return Promise.reject(error);
+        }
+      }
+      if (code) {
+        const errorMsg = error.response.data.message;
+        Notification.error({
+          title: errorMsg || "未知错误",
+          duration: 5000
+        });
+      } else {
+        Notification.error({
+          title: "接口请求失败",
+          duration: 5000
+        });
+      }
+      return Promise.reject(error);
+    }
+  );
+  return Axios;
+};

package/packages/TableMaking/widgetConfig.vue

@@ -631,7 +631,7 @@
               <el-tooltip
                 slot="label"
                 effect="light"
-                content="按钮点击事件绑定的原生页面路径，参数可使用key=value占位，例：/page/path?id=id"
+                content="按钮点击事件绑定的原生页面路径，参数可使用key={value}占位，例：/page/path?id={id}&name=123"
                 placement="top"
               >
                 <span style="color: #409EFF;">关联页面</span>