tianheng-ui 0.1.67 → 0.1.69

package/packages/FormMaking/index.vue

@@ -171,6 +171,7 @@ import {
   baseConfig
 } from "./custom/config";
 import generateCode from "./util/generateCode.js";
+import appConfig from "./config/index";
 import { deepClone } from "./util/index";
 
 export default {
@@ -314,7 +315,10 @@ export default {
           token: this.oauthConfig.token,
           baseUrl: this.oauthConfig.baseUrl
         };
-        sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+        sessionStorage.setItem(
+          appConfig.storageKeys.oauthConfig,
+          JSON.stringify(oauthInfo)
+        );
       } else if (this.oauthConfig.oauth) {
         // 模拟授权认证流程
         this.axios({
@@ -327,7 +331,10 @@ export default {
             token: res.data,
             baseUrl: this.oauthConfig.baseUrl
           };
-          sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+          sessionStorage.setItem(
+            appConfig.storageKeys.oauthConfig,
+            JSON.stringify(oauthInfo)
+          );
         });
       }
     },
@@ -349,9 +356,9 @@ export default {
           } else if (item.type === "table" || item.type === "tableH5") {
             initList(item.options.columns);
           } else if (item.type === "workflow") {
-            initList(item.options.defaultValue.processInstButtons);
+            initList(item.options.buttons);
           } else if (item.options.remote?.open || item.options.remote?.api) {
-            fieldsApi[item.model] = item.options.remote.api;
+            fieldsApi[item.model || item.name] = item.options.remote.api;
           }
         }
       };
@@ -488,6 +495,7 @@ export default {
       align-items: center;
       height: 45px;
       padding: 0 15px;
+      z-index: 99;
     }
     ul {
       position: relative;

package/packages/FormMaking/lang/zh-CN.js

@@ -11,7 +11,7 @@ export default {
         date: '日期选择器',
         rate: '评分',
         color: '颜色选择器',
-        select: '下拉选择框',
+        select: '下拉选择器',
         switch: '开关',
         slider: '滑块',
         text: '文字',
@@ -20,7 +20,7 @@ export default {
         upload: '图片',
         editor: '编辑器',
         cascader: '级联选择器',
-        table: '子表单',
+        table: '子表格',
         grid: '栅格布局',
         tabs: '标签页',
         divider: '分割线'

package/packages/FormMaking/network/axios.js

@@ -0,0 +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;
+};

package/packages/FormMaking/styles/index.scss

@@ -75,7 +75,7 @@
   .draggable-list {
     min-height: 52px;
     background-color: #fff;
-    // border: 1px dashed rgba(170, 170, 170, 0.7);
+    border: 1px dashed rgba(170, 170, 170, 0.7);
   }
 
   .widgetForm {
@@ -150,7 +150,7 @@
       }
 
       .value {
-        color: var(--th-blue);
+        color: $color-parimary;
         cursor: pointer;
       }
     }

package/packages/FormMaking/util/Log.js

@@ -0,0 +1,99 @@
+function Log() {}
+
+Log.prototype.type = ["primary", "success", "warn", "error", "info"];
+
+Log.prototype.typeColor = function(type) {
+  let color = "";
+  switch (type) {
+    case "primary":
+      color = "#2d8cf0";
+      break;
+    case "success":
+      color = "#19be6b";
+      break;
+    case "info":
+      color = "#909399";
+      break;
+    case "warn":
+      color = "#ff9900";
+      break;
+    case "error":
+      color = "#f03f14";
+      break;
+    default:
+      color = "#35495E";
+      break;
+  }
+  return color;
+};
+
+Log.prototype.isArray = function(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]";
+};
+
+Log.prototype.print = function(text, type = "default", back = false) {
+  if (typeof text === "object") {
+    // 如果是對象則調用打印對象方式
+    this.isArray(text) ? console.table(text) : console.dir(text);
+    return;
+  }
+  if (back) {
+    // 如果是打印帶背景圖的
+    console.log(`%c ${text} `, `background:${this.typeColor(type)}; padding: 2px; border-radius: 4px; color: #fff;`);
+  } else {
+    console.log(
+      `%c ${text} `,
+      `border: 1px solid ${this.typeColor(type)};
+        padding: 2px; border-radius: 4px;
+        color: ${this.typeColor(type)};`
+    );
+  }
+};
+
+Log.prototype.printBack = function(type = "primary", title) {
+  this.print(type, title, true);
+};
+
+Log.prototype.pretty = function(type = "primary", title, text) {
+  if (typeof text === "object") {
+    // console.group("Console Group", title);
+    console.log(
+      `%c ${title}`,
+      `background:${this.typeColor(type)};border:1px solid ${this.typeColor(type)};
+        padding: 1px; border-radius: 4px; color: #fff;`
+    );
+    this.isArray(text) ? console.table(text) : console.dir(text);
+    console.groupEnd();
+    return;
+  }
+  console.log(
+    `%c ${title} %c ${text} %c`,
+    `background:${this.typeColor(type)};border:1px solid ${this.typeColor(type)};
+      padding: 1px; border-radius: 4px 0 0 4px; color: #fff;`,
+    `border:1px solid ${this.typeColor(type)};
+      padding: 1px; border-radius: 0 4px 4px 0; color: ${this.typeColor(type)};`,
+    "background:transparent"
+  );
+};
+
+Log.prototype.prettyPrimary = function(title, ...text) {
+  text.forEach(t => this.pretty("primary", title, t));
+};
+
+Log.prototype.prettySuccess = function(title, ...text) {
+  text.forEach(t => this.pretty("success", title, t));
+};
+
+Log.prototype.prettyWarn = function(title, ...text) {
+  text.forEach(t => this.pretty("warn", title, t));
+};
+
+Log.prototype.prettyError = function(title, ...text) {
+  text.forEach(t => this.pretty("error", title, t));
+};
+
+Log.prototype.prettyInfo = function(title, ...text) {
+  text.forEach(t => this.pretty("info", title, t));
+};
+
+export default new Log();

package/packages/FormMaking/util/generateCode.js

@@ -112,7 +112,7 @@ export default function(config, type = "making") {
     },
     methods: {
       handleSubmit () {
-        this.$refs.makingForm.getConfig().then(res => {
+        this.$refs.makingForm.getData().then(res => {
           console.log(res);
         });
       }
@@ -146,7 +146,7 @@ export default function(config, type = "making") {
         console.log(val);
       },
       handleSubmit () {
-        this.$refs.generateForm.getConfig().then(res => {
+        this.$refs.generateForm.getData().then(res => {
           console.log(res);
         });
       }

package/packages/TableMaking/config/index.js

@@ -0,0 +1,8 @@
+export default {
+  title: "TableMaking",
+  logo: "",
+  version: "1.0.0",
+  storageKeys: {
+    oauthConfig: "_TH_OauthConfig"
+  }
+};

package/packages/TableMaking/generateTable.vue

@@ -84,7 +84,8 @@ import Search from "./custom/items/search/index-pc.vue";
 import Tools from "./custom/items/tools/index-pc.vue";
 import STable from "./custom/items/table/index-pc.vue";
 import Actions from "./custom/items/actions/index-pc.vue";
-import * as Axios from "lib/theme-chalk/js/axios";
+import * as Axios from "./network/axios";
+import appConfig from "./config/index";
 import { deepClone } from "../FormMaking/util";
 export default {
   name: "thTableGenerate",
@@ -169,7 +170,10 @@ export default {
           token: this.oauthConfig.token,
           baseUrl: this.oauthConfig.baseUrl
         };
-        sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+        sessionStorage.setItem(
+          appConfig.storageKeys.oauthConfig,
+          JSON.stringify(oauthInfo)
+        );
       } else if (this.oauthConfig.oauth) {
         // 模拟授权认证流程
         this.axios({
@@ -182,7 +186,10 @@ export default {
             token: res.data,
             baseUrl: this.oauthConfig.baseUrl
           };
-          sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+          sessionStorage.setItem(
+            appConfig.storageKeys.oauthConfig,
+            JSON.stringify(oauthInfo)
+          );
           // this.axios.defaults.baseURL = this.oauthConfig.baseUrl;
         });
       }

package/packages/TableMaking/network/axios.js

@@ -0,0 +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;
+};

package/packages/TableMaking/util/Log.js

@@ -0,0 +1,99 @@
+function Log() {}
+
+Log.prototype.type = ["primary", "success", "warn", "error", "info"];
+
+Log.prototype.typeColor = function(type) {
+  let color = "";
+  switch (type) {
+    case "primary":
+      color = "#2d8cf0";
+      break;
+    case "success":
+      color = "#19be6b";
+      break;
+    case "info":
+      color = "#909399";
+      break;
+    case "warn":
+      color = "#ff9900";
+      break;
+    case "error":
+      color = "#f03f14";
+      break;
+    default:
+      color = "#35495E";
+      break;
+  }
+  return color;
+};
+
+Log.prototype.isArray = function(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]";
+};
+
+Log.prototype.print = function(text, type = "default", back = false) {
+  if (typeof text === "object") {
+    // 如果是對象則調用打印對象方式
+    this.isArray(text) ? console.table(text) : console.dir(text);
+    return;
+  }
+  if (back) {
+    // 如果是打印帶背景圖的
+    console.log(`%c ${text} `, `background:${this.typeColor(type)}; padding: 2px; border-radius: 4px; color: #fff;`);
+  } else {
+    console.log(
+      `%c ${text} `,
+      `border: 1px solid ${this.typeColor(type)};
+        padding: 2px; border-radius: 4px;
+        color: ${this.typeColor(type)};`
+    );
+  }
+};
+
+Log.prototype.printBack = function(type = "primary", title) {
+  this.print(type, title, true);
+};
+
+Log.prototype.pretty = function(type = "primary", title, text) {
+  if (typeof text === "object") {
+    // console.group("Console Group", title);
+    console.log(
+      `%c ${title}`,
+      `background:${this.typeColor(type)};border:1px solid ${this.typeColor(type)};
+        padding: 1px; border-radius: 4px; color: #fff;`
+    );
+    this.isArray(text) ? console.table(text) : console.dir(text);
+    console.groupEnd();
+    return;
+  }
+  console.log(
+    `%c ${title} %c ${text} %c`,
+    `background:${this.typeColor(type)};border:1px solid ${this.typeColor(type)};
+      padding: 1px; border-radius: 4px 0 0 4px; color: #fff;`,
+    `border:1px solid ${this.typeColor(type)};
+      padding: 1px; border-radius: 0 4px 4px 0; color: ${this.typeColor(type)};`,
+    "background:transparent"
+  );
+};
+
+Log.prototype.prettyPrimary = function(title, ...text) {
+  text.forEach(t => this.pretty("primary", title, t));
+};
+
+Log.prototype.prettySuccess = function(title, ...text) {
+  text.forEach(t => this.pretty("success", title, t));
+};
+
+Log.prototype.prettyWarn = function(title, ...text) {
+  text.forEach(t => this.pretty("warn", title, t));
+};
+
+Log.prototype.prettyError = function(title, ...text) {
+  text.forEach(t => this.pretty("error", title, t));
+};
+
+Log.prototype.prettyInfo = function(title, ...text) {
+  text.forEach(t => this.pretty("info", title, t));
+};
+
+export default new Log();

package/packages/FormMaking/util/request.js

@@ -1,25 +0,0 @@
-import axios from "axios";
-
-const request = axios.create({
-  withCredentials: false
-});
-
-request.interceptors.request.use(
-  config => {
-    return config;
-  },
-  error => {
-    return Promise.reject(new Error(error).message);
-  }
-);
-
-request.interceptors.response.use(
-  response => {
-    return response.data;
-  },
-  error => {
-    return Promise.reject(new Error(error).message);
-  }
-);
-
-export default request;