@kp-ui/lowcode 1.0.34 → 1.0.36

package/src/mixins/useDataTableMixin.js

@@ -1,17 +1,81 @@
+import { createVNode, Fragment, mergeProps, isVNode } from "vue";
 import { omit, isArray, isEmpty } from "lodash-es";
 import { fmtHttpParams } from "../utils/request/fmtHttpParams.js";
 import { TpfConfirm } from "../hooks/TpfConfirm.js";
-import { useCustomRender } from "../components/CustomRender/useCustomRender.js";
-const { customRender } = useCustomRender();
+import { Space, Button } from "ant-design-vue";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
 const useDataTableMixin = {
   data() {
     return {
-      selectedRowInfo: { selectedRowKeys: [], selectedRows: [] },
+      selectedRowInfo: {
+        selectedRowKeys: [],
+        selectedRows: []
+      },
       selectRow: {},
       loading: false
     };
   },
   computed: {
+    columns() {
+      var _a;
+      const leftFixedColumns = [];
+      const optins = ((_a = this.widget) == null ? void 0 : _a.options) ?? {};
+      if (optins.showIndex) {
+        leftFixedColumns.push({
+          title: "序号",
+          align: "left",
+          width: 90,
+          fixed: "left",
+          field: "dataIndex",
+          customRender: this.customRenderIndex
+        });
+      }
+      const centerColumns = optins.tableColumns.filter((item) => item.show).map((item) => ({
+        ...item,
+        ...this.handleColumnItem(item)
+      }));
+      const rightFixedColumns = [];
+      if (optins.showButtonsColumn) {
+        const operationButtons = optins.operationButtons ?? [];
+        let showOperationButton = this.showOperationButton;
+        let disableOperationButton = this.disableOperationButton;
+        let handleOperationButtonClick = this.handleOperationButtonClick;
+        let getOperationButtonLabel = this.getOperationButtonLabel;
+        rightFixedColumns.push({
+          fixed: "right",
+          align: "center",
+          title: optins.buttonsColumnTitle,
+          width: optins.buttonsColumnWidth,
+          customRender(scope) {
+            let _slot2;
+            return createVNode(Space, null, _isSlot(_slot2 = operationButtons.map((item, index) => {
+              let _slot;
+              if (!showOperationButton(item, scope.index, scope.record)) {
+                return createVNode(Fragment, null, null);
+              }
+              return createVNode(Button, mergeProps({
+                "key": index
+              }, item, {
+                "disabled": disableOperationButton(item, scope.index, scope.record),
+                "onClick": () => handleOperationButtonClick(item.name, scope.index, scope.record, scope, item),
+                "class": ["data-table-" + item.name + "-button"]
+              }), _isSlot(_slot = getOperationButtonLabel(item, scope.index, scope.record)) ? _slot : {
+                default: () => [_slot]
+              });
+            })) ? _slot2 : {
+              default: () => [_slot2]
+            });
+          }
+        });
+      }
+      let columns = [...leftFixedColumns, ...centerColumns, ...rightFixedColumns];
+      console.log({
+        columns
+      });
+      return columns;
+    },
     tableHeight() {
       return this.widget.options.tableHeight || void 0;
     },
@@ -28,7 +92,9 @@ const useDataTableMixin = {
       return this.widget.options.tableSize || "default";
     },
     fmtPagination() {
-      const { showPagination } = this.widget.options;
+      const {
+        showPagination
+      } = this.widget.options;
       if (!showPagination) return false;
       return {
         ...this.widget.options.pagination,
@@ -38,7 +104,10 @@ const useDataTableMixin = {
   },
   methods: {
     handleHidden() {
-      const { onHidden, hidden } = this.widget.options;
+      const {
+        onHidden,
+        hidden
+      } = this.widget.options;
       if (hidden) return true;
       if (onHidden) {
         const onHiddenFn = new Function(onHidden);
@@ -47,22 +116,31 @@ const useDataTableMixin = {
       return false;
     },
     rowClassName(record) {
-      const { rowKey, colorRow } = this.widget.options;
+      const {
+        rowKey,
+        colorRow
+      } = this.widget.options;
       if (!colorRow) return "";
       return this.selectRow[rowKey] === record[rowKey] ? "colorRowClassName" : "";
     },
     handleResizeColumn(w, col) {
-      const { tableColumns } = this.widget.options;
+      const {
+        tableColumns
+      } = this.widget.options;
       const newTableColumns = tableColumns.map((item) => {
         if (item.dataIndex === col.dataIndex) {
           item.width = w;
         }
-        return { ...item };
+        return {
+          ...item
+        };
       });
       this.setTableColumns(newTableColumns);
     },
     disabledClick() {
-      const { hasRowSelection } = this.widget.options.rowSelection;
+      const {
+        hasRowSelection
+      } = this.widget.options.rowSelection;
       if (hasRowSelection) {
         return isEmpty(this.selectedRowInfo.selectedRowKeys);
       }
@@ -82,10 +160,14 @@ const useDataTableMixin = {
       return;
     },
     async delSelectRow(delKeys) {
-      await TpfConfirm({ content: "确定删除选中的数据吗" });
+      await TpfConfirm({
+        content: "确定删除选中的数据吗"
+      });
       delKeys = delKeys || this.selectedRowInfo.selectedRowKeys;
       if (!delKeys.length) return;
-      const { rowKey } = this.widget.options;
+      const {
+        rowKey
+      } = this.widget.options;
       const data = this.getDataSource();
       const newList = data.filter((item) => !(delKeys == null ? void 0 : delKeys.includes(item[rowKey])));
       this.setDataSource(newList);
@@ -110,7 +192,10 @@ const useDataTableMixin = {
       }
     },
     setDataSource(list) {
-      this.selectedRowInfo = { selectedRowKeys: [], selectedRows: [] };
+      this.selectedRowInfo = {
+        selectedRowKeys: [],
+        selectedRows: []
+      };
       this.selectRow = {};
       const val = isArray(list) ? list : [list];
       this.widget.options.dataSource = [...val];
@@ -139,8 +224,13 @@ const useDataTableMixin = {
       }
     },
     handleCustomRow(record) {
-      const { customRow, colorRow } = this.widget.options;
-      const { hasRowSelection } = this.widget.options.rowSelection;
+      const {
+        customRow,
+        colorRow
+      } = this.widget.options;
+      const {
+        hasRowSelection
+      } = this.widget.options.rowSelection;
       return {
         onClick: (event) => {
           if (colorRow) {
@@ -169,14 +259,27 @@ const useDataTableMixin = {
       if (!customRenderFn) return item;
       return {
         ...res,
-        customRender: (params) => {
-          const result = customRender(customRenderFn, params, this);
-          return result;
+        customRender: ({
+          text,
+          record,
+          index,
+          column
+        }) => {
+          try {
+            const cusFunc = new Function("text", "record", "index", "column", customRenderFn);
+            return cusFunc.call(this, text, record, index, column);
+          } catch (error) {
+            console.log({
+              error
+            });
+          }
         }
       };
     },
     getOperationButtonLabel(buttonConfig, rowIndex, row) {
-      const { onGetOperationButtonLabel } = this.widget.options;
+      const {
+        onGetOperationButtonLabel
+      } = this.widget.options;
       if (!!onGetOperationButtonLabel) {
         const customFn = new Function("buttonConfig", "rowIndex", "row", onGetOperationButtonLabel);
         return customFn.call(this, buttonConfig, rowIndex, row);
@@ -192,7 +295,9 @@ const useDataTableMixin = {
           clcFn.call(this, row, rowIndex, scope.column, ob);
           return;
         }
-        const { onOperationButtonClick } = this.widget.options;
+        const {
+          onOperationButtonClick
+        } = this.widget.options;
         if (!!onOperationButtonClick) {
           const customFn = new Function("buttonName", "rowIndex", "row", onOperationButtonClick);
           customFn.call(this, btnName, rowIndex, row);
@@ -204,7 +309,9 @@ const useDataTableMixin = {
       }
     },
     showOperationButton(buttonConfig, rowIndex, row) {
-      const { onHideOperationButton } = this.widget.options;
+      const {
+        onHideOperationButton
+      } = this.widget.options;
       if (!!onHideOperationButton) {
         const customFn = new Function("buttonConfig", "rowIndex", "row", onHideOperationButton);
         return !!customFn.call(this, buttonConfig, rowIndex, row);
@@ -213,7 +320,9 @@ const useDataTableMixin = {
       }
     },
     disableOperationButton(buttonConfig, rowIndex, row) {
-      const { onDisableOperationButton } = this.widget.options;
+      const {
+        onDisableOperationButton
+      } = this.widget.options;
       if (!!onDisableOperationButton) {
         const customFn = new Function("buttonConfig", "rowIndex", "row", onDisableOperationButton);
         return customFn.call(this, buttonConfig, rowIndex, row);
@@ -221,12 +330,16 @@ const useDataTableMixin = {
         return buttonConfig.disabled;
       }
     },
-    customRenderIndex({ index }) {
+    customRenderIndex({
+      index
+    }) {
       return index + 1;
     },
     handleCurrentPageChange(currentPage) {
       this.currentPage = currentPage;
-      const { onCurrentPageChange } = this.widget.options;
+      const {
+        onCurrentPageChange
+      } = this.widget.options;
       if (!!onCurrentPageChange) {
         const customFn = new Function("pageSize", "currentPage", onCurrentPageChange);
         customFn.call(this, this.pageSize, currentPage);
@@ -236,7 +349,9 @@ const useDataTableMixin = {
     },
     handlePageSizeChange(pageSize) {
       this.pageSize = pageSize;
-      const { onPageSizeChange } = this.widget.options;
+      const {
+        onPageSizeChange
+      } = this.widget.options;
       if (!!onPageSizeChange) {
         const customFn = new Function("pageSize", "currentPage", onPageSizeChange);
         customFn.call(this, pageSize, this.currentPage);
@@ -244,13 +359,17 @@ const useDataTableMixin = {
         this.dispatch("VFormRender", "dataTablePageSizeChange", [this, pageSize, this.currentPage]);
       }
     },
-    handleTablePageChange(pagination, filters, sorter, { currentDataSource }) {
+    handleTablePageChange(pagination, filters, sorter, {
+      currentDataSource
+    }) {
       const fn = this.widget.options.onTableChange;
       this.widget.options.pagination.current = pagination.current;
       this.widget.options.pagination.pageSize = pagination.pageSize;
       if (fn) {
         const changeFunc = new Function("pagination", "filters", "sorter", "currentDataSource", fn);
-        changeFunc.call(this, pagination, filters, sorter, { currentDataSource });
+        changeFunc.call(this, pagination, filters, sorter, {
+          currentDataSource
+        });
       }
       this.loadDataTableDataSource();
     },
@@ -262,7 +381,10 @@ const useDataTableMixin = {
       return {
         ...omit(info, ["onChange"]),
         onChange: (selectedRowKeys, selectedRows) => {
-          this.selectedRowInfo = { selectedRowKeys, selectedRows };
+          this.selectedRowInfo = {
+            selectedRowKeys,
+            selectedRows
+          };
           const rcFunc = new Function("selectedRowKeys", "selectedRows", info.onChange);
           rcFunc.call(this, selectedRowKeys, selectedRows);
         }

package/src/utils/request/fmtHttpParams.js

@@ -1,10 +1,13 @@
-import { getHttp, getLocat } from "@kp-ui/tool";
+import { getLocat } from "@kp-ui/tool";
+import http from "./http.js";
 const replaceVars = (sendParams, paramsMap) => {
   Object.entries(sendParams).forEach(([key, value]) => {
     if (key) {
       Object.keys(value).forEach((field) => {
         if (paramsMap[field] !== void 0) {
           sendParams[key][field] = paramsMap[field];
+        } else {
+          sendParams[key][field] = null;
         }
       });
     }
@@ -12,19 +15,18 @@ const replaceVars = (sendParams, paramsMap) => {
   return sendParams;
 };
 async function fmtHttpParams(req, params = {}) {
-  const request = getHttp();
   const { data, vfCtx, ...args } = params;
-  const { http, dataHandlerCode, dataReqHandlerCode } = req;
-  if (!http.url) return;
+  const { http: http$1, dataHandlerCode, dataReqHandlerCode } = req;
+  if (!http$1.url) return;
   const paramsMap = { ...getLocat(), ...data, ...vfCtx, ...args };
-  const method = http.method || "get";
+  const method = http$1.method || "get";
   let sendParams = {
-    params: http.method === "get" ? { ...http.params, ...data } : { ...http.params },
-    data: http.method === "post" ? { ...http.data, ...data } : { ...http.data }
+    params: http$1.method === "get" ? { ...http$1.params, ...data } : { ...http$1.params },
+    data: http$1.method === "post" ? { ...http$1.data, ...data } : { ...http$1.data }
   };
   sendParams = replaceVars(sendParams, paramsMap);
   let p = {
-    ...http,
+    ...http$1,
     method,
     ...sendParams
   };
@@ -34,7 +36,7 @@ async function fmtHttpParams(req, params = {}) {
   }
   if (!p) return;
   console.log("请求参数 ", p);
-  let dsResult = await request(p);
+  let dsResult = await http(p);
   if (dataHandlerCode) {
     const dhFn = new Function("data", dataHandlerCode);
     dsResult = dhFn.call(this, dsResult);

package/src/utils/request/handleAxiosError.js

@@ -0,0 +1,31 @@
+import { message } from "ant-design-vue";
+const handleErrorStatus = {
+  401: (data) => {
+    message.error(data.statusText);
+    window.location.href.toString();
+  },
+  403: (data) => {
+    message.error(data.statusText);
+  },
+  404: (data) => {
+    message.error(data.statusText);
+  },
+  418: (data) => {
+    message.error(data.statusText);
+  },
+  429: (data) => {
+    message.error(data.statusText);
+  },
+  500: (data) => {
+    message.error("网络繁忙");
+  },
+  510: (data) => {
+    message.error(data.data.errorMessage || data.statusText);
+  },
+  599: (data) => {
+    message.error(data.data.errorMessage);
+  }
+};
+export {
+  handleErrorStatus
+};

package/src/utils/request/http.js

@@ -0,0 +1,81 @@
+import { getUserInfo } from "@kp-ui/tool";
+import { getHttp } from "@kp-ui/tool";
+import axios from "axios";
+import { message } from "ant-design-vue";
+import { handleErrorStatus } from "./handleAxiosError.js";
+const http = axios.create({
+  timeout: 6e5,
+  baseURL: void 0,
+  withCredentials: true,
+  // transformResponse: [
+  //   function (data) {
+  //     try {
+  //       return JSONBig.parse(data);
+  //     } catch (error) {
+  //       console.log(error);
+  //       return data;
+  //     }
+  //   }
+  // ],
+  validateStatus(status) {
+    return status <= 600;
+  }
+});
+http.interceptors.request.use((config) => {
+  const { tokenId, tenantId, employeeId } = getUserInfo();
+  config.withCredentials = true;
+  if (!config.headers) {
+    config.headers = {};
+  }
+  config.headers["mes-user"] = "{}";
+  config.headers["imeclient-type"] = "PC";
+  config.headers["imeclient-source"] = "tmgc2";
+  config.headers["imeclient-version"] = "1.0";
+  config.headers["accept-language"] = "zh-CN";
+  if (tokenId) {
+    config.headers["Authorization"] = "Bearer " + tokenId;
+  }
+  if (tenantId) {
+    config.headers["imeclient-tenant-id"] = tenantId;
+  }
+  if (employeeId) {
+    config.headers["imeclient-employee-id"] = employeeId;
+  }
+  return config;
+});
+http.interceptors.response.use(
+  (data) => {
+    if ([200].includes(data.status)) {
+      const resData = data.data;
+      if (data.config.responseType === "blob") {
+        return data;
+      }
+      if (resData.success === true) {
+        return resData;
+      }
+      message.error(resData.errorMessage || "接口报错");
+      return Promise.reject(data);
+    } else {
+      if (handleErrorStatus[Number(data.status)]) {
+        handleErrorStatus[Number(data.status)](data);
+      } else {
+        message.error(data.statusText);
+      }
+      return Promise.reject(data);
+    }
+  },
+  (error) => {
+    if (error.name === "CanceledError") {
+      return Promise.reject(error);
+    }
+    if (!error.response) {
+      return Promise.reject(error);
+    }
+    console.log(error);
+    return Promise.reject(error);
+  }
+);
+export {
+  http as default,
+  getHttp
+};