xydata-tools 1.1.29 → 1.1.31

package/dist/components/index.js

@@ -8,5 +8,6 @@ export { default as UploadFile } from "./uploadFile";
 export { default as DownloadFile } from "./downloadFile";
 export { default as Version } from "./tools/version";
 export { default as MaterialCard } from "./materialCard";
+export { default as LogQuery } from "./log-query";
 export * from "./payment";
 export * from "./sms";

package/dist/components/log-query/components/LogTextPreviewModal.js

@@ -0,0 +1,78 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import { Modal } from 'antd';
+import ReactJson from 'react-json-view';
+import "./LogTextPreviewModal.less";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+var parseContent = function parseContent(content) {
+  if (!content) return null;
+  if (_typeof(content) === 'object') return content;
+  try {
+    return JSON.parse(content);
+  } catch (error) {
+    return content;
+  }
+};
+var LogTextPreviewModal = function LogTextPreviewModal(_ref) {
+  var open = _ref.open,
+    title = _ref.title,
+    content = _ref.content,
+    onCancel = _ref.onCancel;
+  var parsedContent = parseContent(content);
+  var isJsonObject = parsedContent && _typeof(parsedContent) === 'object';
+  var isStackTrace = title === '异常堆栈' && typeof content === 'string';
+  var stackLines = isStackTrace ? content.split('\n').map(function (line) {
+    return line.trim();
+  }).filter(Boolean) : [];
+  var stackSummary = stackLines[0] || '';
+  var stackFrames = stackLines.slice(1);
+  return /*#__PURE__*/_jsx(Modal, {
+    title: title,
+    open: open,
+    onCancel: onCancel,
+    footer: null,
+    width: 960,
+    destroyOnClose: true,
+    style: {
+      top: 20
+    },
+    className: "log-text-preview-modal",
+    children: /*#__PURE__*/_jsx("div", {
+      className: "content-wrapper",
+      children: isJsonObject ? /*#__PURE__*/_jsx("div", {
+        className: "json-container",
+        children: /*#__PURE__*/_jsx(ReactJson, {
+          src: parsedContent,
+          name: false,
+          collapsed: 2,
+          displayDataTypes: false,
+          enableClipboard: false,
+          theme: "monokai"
+        })
+      }) : isStackTrace ? /*#__PURE__*/_jsxs("div", {
+        className: "stack-trace-wrapper",
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "stack-summary",
+          children: stackSummary || '-'
+        }), /*#__PURE__*/_jsx("div", {
+          className: "stack-panel",
+          children: stackFrames.length > 0 ? stackFrames.map(function (line, index) {
+            return /*#__PURE__*/_jsx("div", {
+              className: "stack-line",
+              children: /*#__PURE__*/_jsx("code", {
+                className: "stack-line-text",
+                children: line
+              })
+            }, "".concat(line, "-").concat(index));
+          }) : /*#__PURE__*/_jsx("pre", {
+            className: "text-block",
+            children: content || '-'
+          })
+        })]
+      }) : /*#__PURE__*/_jsx("pre", {
+        className: "text-block",
+        children: content || '-'
+      })
+    })
+  });
+};
+export default LogTextPreviewModal;

package/dist/components/log-query/components/LogTextPreviewModal.less

@@ -0,0 +1,93 @@
+@primary-color: #1890ff;
+
+.log-text-preview-modal {
+	 
+	.content-wrapper {
+		max-height: calc(100vh - 200px);
+		overflow-y: auto;
+		padding-right: 8px;
+
+		&::-webkit-scrollbar {
+			width: 6px;
+		}
+
+		&::-webkit-scrollbar-thumb {
+			background: rgba(0, 0, 0, 0.18);
+			border-radius: 999px;
+		}
+	}
+
+	.json-container {
+		padding: 12px;
+		border: 1px solid #3e3d32; 
+		background: #272822;
+	}
+
+	.stack-trace-wrapper {
+		display: flex;
+		flex-direction: column;
+		background: #000000;
+		border: 1px solid #1f2937; 
+		overflow: hidden;
+	}
+
+	.stack-summary {
+		padding: 14px 18px;
+		background: rgba(255, 255, 255, 0.05);
+		border-bottom: 1px solid #1f2937;
+		color: #ef4444;
+		font-size: 14px;
+		line-height: 1.6;
+		font-weight: 600;
+		word-break: break-word;
+		font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+	}
+
+	.stack-panel {
+		background: transparent;
+		padding: 16px 0;
+		overflow: auto;
+
+		.text-block {
+			background: transparent;
+			border: none;
+			color: #e2e8f0;
+			padding: 0 16px;
+			font-size: 13px;
+		}
+	}
+
+	.stack-line {
+		display: flex;
+		align-items: flex-start;
+		padding: 4px 16px;
+		min-width: max-content;
+		transition: background-color 0.2s;
+
+		&:hover {
+			background-color: rgba(255, 255, 255, 0.05);
+		}
+	}
+
+	.stack-line-text {
+		color: #e2e8f0;
+		font-size: 13px;
+		line-height: 1.8;
+		white-space: pre-wrap;
+		word-break: break-all;
+		font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+	}
+
+	.text-block {
+		margin: 0;
+		padding: 16px;
+		border: 1px solid #1f2937; 
+		background: #0f172a;
+		color: #e2e8f0;
+		font-size: 13px;
+		line-height: 1.7;
+		white-space: pre-wrap;
+		word-break: break-word;
+		font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+	}
+}

package/dist/components/log-query/index.js

@@ -0,0 +1,220 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useRef, useState } from 'react';
+import { Tabs } from 'antd';
+import ProTable from '@ant-design/pro-table';
+import moment from 'moment';
+import { handleTableResponse } from "../../utils/utils";
+import { queryErrorLogsPage, queryOperationLogsPage } from "./service";
+import LogTextPreviewModal from "./components/LogTextPreviewModal";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+var DEFAULT_DATE = moment().format('YYYY-MM-DD');
+var LOG_TYPE_OPTIONS = ['api', 'front', 'service'].map(function (value) {
+  return {
+    label: value,
+    value: value
+  };
+});
+var previewText = function previewText(value) {
+  if (!value && value !== 0) return '-';
+  var text = typeof value === 'string' ? value : JSON.stringify(value);
+  return text.length > 32 ? "".concat(text.slice(0, 32), "...") : text;
+};
+var LogQuery = function LogQuery() {
+  var operationActionRef = useRef();
+  var errorActionRef = useRef();
+  var _useState = useState('operation'),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  var _useState3 = useState({
+      open: false,
+      title: '',
+      content: ''
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    previewState = _useState4[0],
+    setPreviewState = _useState4[1];
+  var baseTableColumns = [{
+    title: '操作日期',
+    dataIndex: 'operationDate',
+    valueType: 'date',
+    width: 100,
+    initialValue: moment(),
+    fieldProps: {
+      allowClear: true
+    },
+    search: {
+      transform: function transform(value) {
+        return {
+          operationDate: value ? moment(value).format('YYYY-MM-DD') : DEFAULT_DATE
+        };
+      }
+    }
+  }, {
+    title: '操作时间',
+    dataIndex: 'operationTime',
+    width: 100,
+    search: false
+  }, {
+    title: '日志类型',
+    dataIndex: 'logType',
+    valueType: 'select',
+    width: 100,
+    fieldProps: {
+      options: LOG_TYPE_OPTIONS,
+      allowClear: true
+    }
+  }, {
+    title: '操作人',
+    dataIndex: 'operationUserName',
+    width: 120
+  }, {
+    title: '描述',
+    dataIndex: 'description',
+    ellipsis: true,
+    width: 220
+  }, {
+    title: '执行时间(ms)',
+    dataIndex: 'executeTime',
+    width: 100,
+    search: false
+  }, {
+    title: '接口地址',
+    dataIndex: 'url',
+    ellipsis: true,
+    width: 220,
+    search: false,
+    copyable: true
+  }, {
+    title: 'IP地址',
+    dataIndex: 'ip',
+    width: 140,
+    search: false
+  }];
+  var createTextColumn = function createTextColumn(title, dataIndex) {
+    return {
+      title: title,
+      dataIndex: dataIndex,
+      search: false,
+      width: 220,
+      render: function render(_, record) {
+        var value = record[dataIndex];
+        if (!value) return '-';
+        return /*#__PURE__*/_jsx("a", {
+          onClick: function onClick() {
+            return setPreviewState({
+              open: true,
+              title: title,
+              content: value
+            });
+          },
+          children: previewText(value)
+        });
+      }
+    };
+  };
+  var operationColumns = [].concat(baseTableColumns, [createTextColumn('请求参数', 'params'), createTextColumn('返回数据', 'returnData')]);
+  var errorColumns = [].concat(baseTableColumns, [createTextColumn('异常堆栈', 'throwable'), createTextColumn('请求参数', 'params')]);
+  var buildRequest = function buildRequest(queryFn, actionRef) {
+    return /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+        var current, pageSize, operationDate, operationUser, description, logType, res;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              current = params.current, pageSize = params.pageSize, operationDate = params.operationDate, operationUser = params.operationUser, description = params.description, logType = params.logType;
+              _context.next = 3;
+              return queryFn({
+                current: current,
+                pageSize: pageSize,
+                searchObject: {
+                  operationDate: operationDate || DEFAULT_DATE,
+                  operationUser: operationUser,
+                  description: description,
+                  logType: logType
+                }
+              });
+            case 3:
+              res = _context.sent;
+              return _context.abrupt("return", handleTableResponse({
+                res: res,
+                actionRef: actionRef
+              }));
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  };
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Tabs, {
+      activeKey: activeKey,
+      onChange: setActiveKey,
+      items: [{
+        key: 'operation',
+        label: '操作日志',
+        children: /*#__PURE__*/_jsx(ProTable, {
+          headerTitle: "\u64CD\u4F5C\u65E5\u5FD7",
+          actionRef: operationActionRef,
+          rowKey: "id",
+          search: {
+            labelWidth: 100
+          },
+          columns: operationColumns,
+          request: buildRequest(queryOperationLogsPage, operationActionRef),
+          form: {
+            ignoreRules: false
+          },
+          scroll: {
+            x: 1600
+          }
+        })
+      }, {
+        key: 'error',
+        label: '错误日志',
+        children: /*#__PURE__*/_jsx(ProTable, {
+          headerTitle: "\u9519\u8BEF\u65E5\u5FD7",
+          actionRef: errorActionRef,
+          rowKey: "id",
+          search: {
+            labelWidth: 100
+          },
+          columns: errorColumns,
+          request: buildRequest(queryErrorLogsPage, errorActionRef),
+          form: {
+            ignoreRules: false
+          },
+          scroll: {
+            x: 1600
+          }
+        })
+      }]
+    }), /*#__PURE__*/_jsx(LogTextPreviewModal, {
+      open: previewState.open,
+      title: previewState.title,
+      content: previewState.content,
+      onCancel: function onCancel() {
+        return setPreviewState({
+          open: false,
+          title: '',
+          content: ''
+        });
+      }
+    })]
+  });
+};
+export default LogQuery;

package/dist/components/log-query/service.js

@@ -0,0 +1,63 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import doRequest from "../../utils/request.js";
+
+/**
+ * @api 分页查询操作日志
+ *
+ * @param {Number} params.current 当前页码 @example 1【非必填】
+ * @param {Number} params.pageSize 每页条数 @example 10【非必填】
+ * @param {Object} params.searchObject 查询条件【非必填】
+ * @param {String} params.searchObject.logType 日志类型【非必填】
+ * @param {String} params.searchObject.description 描述【非必填】
+ * @param {String} params.searchObject.operationDate 操作日期【非必填】
+ * @param {String} params.searchObject.operationUser 操作人【非必填】
+ */
+export function queryOperationLogsPage(_x) {
+  return _queryOperationLogsPage.apply(this, arguments);
+}
+
+/**
+ * @api 分页查询错误日志
+ *
+ * @param {Number} params.current 当前页码 @example 1【非必填】
+ * @param {Number} params.pageSize 每页条数 @example 10【非必填】
+ * @param {Object} params.searchObject 查询条件【非必填】
+ * @param {String} params.searchObject.logType 日志类型【非必填】
+ * @param {String} params.searchObject.description 描述【非必填】
+ * @param {String} params.searchObject.operationDate 操作日期【非必填】
+ * @param {String} params.searchObject.operationUser 操作人【非必填】
+ */
+function _queryOperationLogsPage() {
+  _queryOperationLogsPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", doRequest('/api/log/queryLogsPage', 'POST', params));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _queryOperationLogsPage.apply(this, arguments);
+}
+export function queryErrorLogsPage(_x2) {
+  return _queryErrorLogsPage.apply(this, arguments);
+}
+function _queryErrorLogsPage() {
+  _queryErrorLogsPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", doRequest('/api/log/queryErrorLogsPage', 'POST', params));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _queryErrorLogsPage.apply(this, arguments);
+}

package/dist/components/uni-app/media-picker/shmily-drag-media.vue

@@ -186,7 +186,8 @@ export default {
 		enableAddButton: {
 			type: Boolean,
 			default: false
-		}
+		}, 
+	 
 	},
 	data() {
 		return {
@@ -205,7 +206,9 @@ export default {
 			changeStatus: true,
 			preStatus: true,
 			first: true,
-			lastTouchEndTime: null // 记录最后一次 touchend 的时间，用于避免重复触发
+			lastTouchEndTime: null, // 记录最后一次 touchend 的时间，用于避免重复触发
+			clickThreshold: 20,
+			longPressTime: 300
 		};
 	},
 	computed: {
@@ -447,12 +450,19 @@ export default {
 			item.zIndex = 99;
 			item.moveEnd = true;
 			this.tempItem = item;
+			
+			// 记录起始坐标，用于通过位移判断点击
+			item.startX = item.oldX;
+			item.startY = item.oldY;
+
 			this.timer = setTimeout(() => {
 				item.scale = this.scale;
 				item.opacity = this.opacity;
-				clearTimeout(this.timer);
-				this.timer = null;
-			}, 200);
+				if (this.timer) {
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+			}, this.longPressTime);
 		},
 		handleClick(item, type) {
 			// 设为disable后无法触发touch事件
@@ -485,13 +495,21 @@ export default {
 			}
 
 			// 判断是否为点击操作（而非拖动）
-			if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
+			const moveDistance = Math.sqrt(Math.pow(item.oldX - (item.startX || 0), 2) + Math.pow(item.oldY - (item.startY || 0), 2));
+			const isClickAction = this.timer && moveDistance < this.rpx2px(this.clickThreshold);
+
+			if (isClickAction && this.preStatus && this.changeStatus) {
 				if (this.moveType === 'video') {
 					this.playVideo(item);
 				} else {
-					this.previewImage(item);
+					setTimeout(()=>{
+                        this.previewImage(item);
+                    },0)
 				}
-			} else if (this.timer) {
+			}
+
+			// 无论是否触发点击，都需清理计时器防止后续意外放大
+			if (this.timer) {
 				clearTimeout(this.timer);
 				this.timer = null;
 			}
@@ -688,6 +706,8 @@ export default {
 				id: this.guid(16),
 				disable: false,
 				offset: 0,
+				startX: 0,
+				startY: 0,
 				moveEnd: false,
 				loading: true
 			});

package/dist/components/xyAuthLayout/index.js

@@ -6,6 +6,7 @@ import { useEffect } from 'react';
 import { getSessionStorage, setSessionStorage, removeSessionStorage } from "../../utils/token.js";
 import { message, Spin } from 'antd';
 import { queryAaaCurrent, queryCurrent, accountAAALogout } from "../../services/service.js";
+import { getQueryVariable } from "../../utils/utils";
 
 // ========== 公共辅助函数 ==========
 
@@ -187,11 +188,13 @@ var ssoTypeByOld = /*#__PURE__*/function () {
           return response.json();
         case 10:
           data = _context3.sent;
-          token = data.access_token || (data.rspCode === '000000' ? data.data : null);
+          token = data.data;
           if (token) {
             saveTokenAndRedirect(token);
-          } else {
+          } else if (data.rspCode !== '000000') {
             message.error(data.rspMsg);
+          } else {
+            message.error('token获取失败');
           }
           _context3.next = 19;
           break;
@@ -240,8 +243,9 @@ var XyAuthLayout = function XyAuthLayout(props) {
   var token = getSessionStorage('Token');
   var loginType = envData.login_type || 'BOTH';
   var pathName = window.location.pathname;
+  var loginId = getQueryVariable('loginId');
   useEffect(function () {
-    if (!token) {
+    if (!token && !(loginId && ['BOTH', 'AAA'].includes(loginType))) {
       // 当登录方式为SSO_NEW或BOTH时，可在路径加上sso进行统一登陆，当登录方式固定为SSO或SSO_NEW时，直接跳转到SSO登录
       if (['SSO_NEW', 'BOTH'].includes(loginType) && pathName.indexOf('/sso') >= 0 || ['SSO', 'SSO_NEW'].includes(loginType)) {
         setSessionStorage('sso_redirect_url', window.location.href);
@@ -251,11 +255,12 @@ var XyAuthLayout = function XyAuthLayout(props) {
         window.location.href = "".concat(window.publicPath || '/', "user/login");
       }
     } else {
-      getUserinfo();
+      // 当有TOKEN或者AAA登录并携带loginId时可进入
+      getUserinfo(loginId);
     }
   }, []);
   var getUserinfo = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(loginId) {
       var response;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -273,12 +278,16 @@ var XyAuthLayout = function XyAuthLayout(props) {
             break;
           case 7:
             _context4.next = 9;
-            return queryAaaCurrent({});
+            return queryAaaCurrent({}, {
+              headers: {
+                loginId: loginId
+              }
+            });
           case 9:
             _context4.t0 = _context4.sent;
           case 10:
             response = _context4.t0;
-            if (!((response === null || response === void 0 ? void 0 : response.status) === 401 || (response === null || response === void 0 ? void 0 : response.rspCode) === '401')) {
+            if (!((response === null || response === void 0 ? void 0 : response.status) === 401)) {
               _context4.next = 17;
               break;
             }
@@ -311,7 +320,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
         }
       }, _callee4, null, [[0, 20]]);
     }));
-    return function getUserinfo() {
+    return function getUserinfo(_x) {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -319,6 +328,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
   // 加载状态
   if (!token) {
     return /*#__PURE__*/_jsx("div", {
+      className: "xyAuthLayoutLoading",
       style: {
         display: 'flex',
         justifyContent: 'center',

package/dist/services/service.js

@@ -24,17 +24,17 @@ function _queryCurrent() {
   }));
   return _queryCurrent.apply(this, arguments);
 }
-export function queryAaaCurrent(_x2) {
+export function queryAaaCurrent(_x2, _x3) {
   return _queryAaaCurrent.apply(this, arguments);
 }
 
 // 退出登录 | aaa
 function _queryAaaCurrent() {
-  _queryAaaCurrent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+  _queryAaaCurrent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params, options) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", doRequest('/api/aaa/current', 'POST', params));
+          return _context2.abrupt("return", doRequest('/api/aaa/current', 'POST', params, options));
         case 1:
         case "end":
           return _context2.stop();
@@ -43,7 +43,7 @@ function _queryAaaCurrent() {
   }));
   return _queryAaaCurrent.apply(this, arguments);
 }
-export function accountAAALogout(_x3) {
+export function accountAAALogout(_x4) {
   return _accountAAALogout.apply(this, arguments);
 }
 function _accountAAALogout() {

package/dist/types/components/index.d.ts

@@ -7,6 +7,7 @@ export { default as UploadFile } from "./uploadFile";
 export { default as DownloadFile } from "./downloadFile";
 export { default as Version } from "./tools/version";
 export { default as MaterialCard } from "./materialCard";
+export { default as LogQuery } from "./log-query";
 export * from "./payment";
 export * from "./sms";
 export { default as XyAuthLayout, logout, handleUnauthorized } from "./xyAuthLayout";

package/dist/types/components/log-query/components/LogTextPreviewModal.d.ts

@@ -0,0 +1,7 @@
+export default LogTextPreviewModal;
+declare function LogTextPreviewModal({ open, title, content, onCancel }: {
+    open: any;
+    title: any;
+    content: any;
+    onCancel: any;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/log-query/index.d.ts

@@ -0,0 +1,2 @@
+export default LogQuery;
+import LogQuery from "./index.jsx";

package/dist/utils/request.js

@@ -11,7 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * request 网络请求工具
  */
 import { notification, message } from 'antd';
-import { getSessionStorage } from "./token.js";
+import { getSessionStorage, setSessionStorage } from "./token.js";
 import { handleUnauthorized } from "../components";
 
 /* ********************************************************************************************************************************* */
@@ -133,6 +133,7 @@ function _doRequest() {
       token,
       response,
       fetchOptions,
+      _token,
       result,
       rspCode,
       _args2 = arguments;
@@ -177,36 +178,41 @@ function _doRequest() {
           return _context2.abrupt("return", errorHandler(null));
         case 16:
           if (!response.ok) {
-            _context2.next = 30;
+            _context2.next = 32;
             break;
           }
           _context2.prev = 17;
-          _context2.next = 20;
+          // 如果获取用户的接口上有返回token，那么存储token
+          _token = response.headers.get('Authorization');
+          if (response.url.indexOf('/api/aaa/current') && _token) {
+            setSessionStorage('Token', _token);
+          }
+          _context2.next = 22;
           return response.clone().json();
-        case 20:
+        case 22:
           result = _context2.sent;
           rspCode = result.rspCode; // 状态编码只有在已定义的，需要处理的编码里才会返回响应，否则会进入错误回调
           if (!(rspCode && PROCESS_RESPONSE_CODES.includes(rspCode))) {
-            _context2.next = 24;
+            _context2.next = 26;
             break;
           }
           return _context2.abrupt("return", result);
-        case 24:
-          _context2.next = 30;
-          break;
         case 26:
-          _context2.prev = 26;
+          _context2.next = 32;
+          break;
+        case 28:
+          _context2.prev = 28;
           _context2.t1 = _context2["catch"](17);
           // JSON 解析失败，按网络异常处理
           console.error(_context2.t1);
           return _context2.abrupt("return", errorHandler(null));
-        case 30:
+        case 32:
           return _context2.abrupt("return", errorHandler(response));
-        case 31:
+        case 33:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[4, 12], [17, 26]]);
+    }, _callee2, null, [[4, 12], [17, 28]]);
   }));
   return _doRequest.apply(this, arguments);
 }

package/dist/utils/utils.js

@@ -31,15 +31,17 @@ export var asyncCallback = function asyncCallback(res, isTip) {
  * @returns {string|boolean} - 返回查询参数的值，如果不存在则返回 false
  */
 export function getQueryVariable(variable) {
-  var query = window.location.search.substring(1);
+  var parts = window.location.href.split('?');
+  if (parts.length < 2) return null;
+  var query = parts[1];
   var vars = query.split('&');
   for (var i = 0; i < vars.length; i++) {
     var pair = vars[i].split('=');
-    if (pair[0] == variable) {
-      return pair[1];
+    if (decodeURIComponent(pair[0]) === variable) {
+      return decodeURIComponent(pair[1]);
     }
   }
-  return false;
+  return null;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.29",
+	"version": "1.1.31",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",