venus-design 1.1.17 → 1.1.19

package/dist/DataView/resizable/index.js

@@ -30,7 +30,7 @@ import { ProTable } from '@ant-design/pro-components';
 import { SlidersOutlined } from '@ant-design/icons';
 import { saveAs } from "file-saver";
 import * as ExcelJs from 'exceljs';
-import Drawer from "../../Drawer";
+import { DrawerDataAuth } from "../..";
 
 // 拖拽辅助线
 var ResizeGuideLine = function ResizeGuideLine(_ref) {
@@ -269,14 +269,29 @@ var ResizableTabel = function ResizableTabel(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            if (!props.dataSource) {
+              _context.next = 4;
+              break;
+            }
+            //全量数据
+            if (props.getExportData != undefined) {
+              //使用自定义组装数据的方法
+              tableExport(props.getExportData(props.dataSource), props.columnsFnExport != undefined ? props.columnsFnExport : props.columns, props.exportFileName != undefined ? props.exportFileName : "导出");
+            } else {
+              //调用默认组装数据的方法
+              tableExport(getClientDataZ(props.dataSource, props.columns), props.columns, props.exportFileName != undefined ? props.exportFileName : "导出");
+            }
+            _context.next = 8;
+            break;
+          case 4:
+            _context.next = 6;
             return props.request({
               current: 1,
               pageSize: pageSize,
               limit: 10000,
               page: 1
             });
-          case 2:
+          case 6:
             res = _context.sent;
             if (res.success) {
               if (res.total > pageSize) {
@@ -292,7 +307,7 @@ var ResizableTabel = function ResizableTabel(props) {
                 }
               }
             }
-          case 4:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -384,7 +399,7 @@ var ResizableTabel = function ResizableTabel(props) {
         }
       }))]);
     }
-  })), /*#__PURE__*/React.createElement(Drawer, {
+  })), /*#__PURE__*/React.createElement(DrawerDataAuth, {
     open: qxVisible,
     onClose: function onClose() {
       return setQxVisible(false);

package/dist/Drawer/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import "./style.less";
+import "./style.css";
 /**
  * 数据权限抽屉
  * @autor gao

package/dist/Drawer/index.js

@@ -1,7 +1,7 @@
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
-import "antd/es/app/style";
-import _App from "antd/es/app";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 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; }
@@ -22,7 +22,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React, { useState, useEffect } from 'react';
 import { DrawerForm, ProFormCheckbox } from '@ant-design/pro-components';
 import { getDataPrivilege, saveDataPrivilege, updateDataPrivilege } from "./service";
-import "./style.less";
+import "./style.css";
 import { SelectOrg, SelectRoleDataPremission } from "./..";
 import { getMenuId } from "../VenusTable/handleVenusTableFunctions";
 import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
@@ -99,9 +99,6 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     data = _useState8[0],
     setData = _useState8[1];
-  var _App$useApp = _App.useApp(),
-    message = _App$useApp.message,
-    modal = _App$useApp.modal;
   /**
    * 获取数据权限
    * @param permission 
@@ -162,7 +159,7 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
           case 6:
             res = _context2.sent;
             if (res && res.success) {
-              message.success("成功!");
+              _message.success("成功!");
             }
             _context2.next = 10;
             return saveSubmitIng(false);

package/dist/VenusTable/index.js

@@ -241,8 +241,6 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
         columns.push(v);
       });
     }
-    console.log(columns);
-
     //@ts-ignore
     setColumns(columns || []);
   };
@@ -469,7 +467,7 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     param: dataParam,
     toolBarRender: function toolBarRender() {
       var res = props.toolBarRender == undefined ? [] : props.toolBarRender();
-      return [].concat(_toConsumableArray(res), [props.searchHigh && isSearchFilterHaveData() ? /*#__PURE__*/React.createElement(_Button, {
+      return [].concat(_toConsumableArray(res), [props.searchHigh ? isSearchFilterHaveData() ? /*#__PURE__*/React.createElement(_Button, {
         danger: true,
         size: "small",
         className: "venus-table-exist-filter",
@@ -505,7 +503,7 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
           cursor: 'pointer',
           color: isSearchFilterHaveData() ? '#1890FF' : '#000'
         }
-      }))]);
+      })) : null]);
     }
     //@ts-ignore
     ,

package/dist/VenusTable/staticAttr.js

@@ -529,6 +529,7 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
       }
       var key = "".concat(record.innerId, "-").concat(column.fieldId);
       var editing = Boolean(actions.editingMap[key]);
+      console.log(actions.editingMap);
 
       /* 统一回写 */
       var finishEdit = function finishEdit(newVal) {

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export { default as CheckBoxInput } from './CheckBoxInput';
 export { default as VenusUploadSecLevelForm } from './VenusUploadForm';
 export { default as UploadImage } from './UploadImage';
 export { default as NotificationManager, notifier } from './NotificationManager';
+export { default as DrawerDataAuth } from './Drawer';
 export { getUserInfo, getLockScreenTime, getMenuConfig, addMenuConfig, editMenuConfig, getUserMenu, getMenus, getDifyConfigs, deleteFile, validateLogin, deleteNewFile, downloadFile, venusAi, uploadFile, updateSecLevelId, fileByAssId, mnLoginDify, refreshTokenFn, getFileData, getUserOrgTreeList, getRoleList, getVenusAdjust, getColumnData, getFormData, getDetailColumnData, getElementRules, getSecLevelDataList, getExpressionList, getUserListBySecLevelId, getDictItemByType, getDataListBase, getDataListTable, getUserList, listAppData, getAppByUser, SelectBysceneIdAndCreateBy, Wftrack, getSecByUserSecId, getFormDesignList, loginOutService, onChangePassword, excelFieldTable, downloadExcelTemplateUrl } from './Config/api';
 export { default as request } from './Config/request';
 export { default as storage, checkCookieAuth } from './Config/storage';

package/dist/index.js

@@ -11,6 +11,8 @@ export { default as CheckBoxInput } from "./CheckBoxInput";
 export { default as VenusUploadSecLevelForm } from "./VenusUploadForm";
 export { default as UploadImage } from "./UploadImage";
 export { default as NotificationManager, notifier } from "./NotificationManager";
+//数据权限
+export { default as DrawerDataAuth } from "./Drawer";
 export { getUserInfo, getLockScreenTime, getMenuConfig, addMenuConfig, editMenuConfig, getUserMenu, getMenus, getDifyConfigs, deleteFile, validateLogin, deleteNewFile, downloadFile, venusAi, uploadFile, updateSecLevelId, fileByAssId, mnLoginDify, refreshTokenFn, getFileData, getUserOrgTreeList, getRoleList, getVenusAdjust, getColumnData, getFormData, getDetailColumnData, getElementRules, getSecLevelDataList, getExpressionList, getUserListBySecLevelId, getDictItemByType, getDataListBase, getDataListTable, getUserList, listAppData, getAppByUser, SelectBysceneIdAndCreateBy, Wftrack, getSecByUserSecId, getFormDesignList, loginOutService, onChangePassword, excelFieldTable, downloadExcelTemplateUrl } from "./Config/api";
 export { default as request } from "./Config/request";
 export { default as storage, checkCookieAuth } from "./Config/storage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venus-design",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",