venus-design 1.1.17 → 1.1.18

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/VenusTable/index.js

@@ -142,6 +142,7 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     setEditingMap = _useState18[1];
   var filterDrawerRef = React.useRef(null);
   var toggleEdit = function toggleEdit(key, editing) {
+    console.log(key, editing);
     setEditingMap(function (prev) {
       return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, key, editing));
     });
@@ -241,8 +242,6 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
         columns.push(v);
       });
     }
-    console.log(columns);
-
     //@ts-ignore
     setColumns(columns || []);
   };
@@ -469,7 +468,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 +504,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.18",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",