venus-design 1.1.21 → 1.1.24

package/dist/VenusTable/index.js

@@ -314,10 +314,15 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
       } else {
         if (filters[key].length > 1 && isArray(filters[key])) {
           dataParamBefore[key] = undefined;
-          dataParamBefore[key + "Range"] = filters[key];
+          dataParamBefore[key + "Range"] = filters[key][0];
         } else {
-          dataParamBefore[key + "Range"] = undefined;
-          dataParamBefore[key] = filters[key][0];
+          if (isArray(filters[key])) {
+            dataParamBefore[key + "Range"] = undefined;
+            dataParamBefore[key] = filters[key][0];
+          } else {
+            dataParamBefore[key + "Range"] = undefined;
+            dataParamBefore[key] = filters[key];
+          }
         }
       }
     });
@@ -362,8 +367,8 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var actions = {
     editingMap: editingMap,
     toggleEdit: toggleEdit,
-    onUpdateFields: function () {
-      var _onUpdateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(fieldName, formUnitType, value, innerId, record) {
+    onUpdateFieldValues: function () {
+      var _onUpdateFieldValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(fieldName, formUnitType, value, innerId, record) {
         var ownerApp, appPrefix, nameAndId, userFormateValue, res, _res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -428,10 +433,10 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
           }
         }, _callee3);
       }));
-      function onUpdateFields(_x3, _x4, _x5, _x6, _x7) {
-        return _onUpdateFields.apply(this, arguments);
+      function onUpdateFieldValues(_x3, _x4, _x5, _x6, _x7) {
+        return _onUpdateFieldValues.apply(this, arguments);
       }
-      return onUpdateFields;
+      return onUpdateFieldValues;
     }()
   };
   /**
@@ -464,7 +469,34 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     ,
     rowSelection: props.showCheckBoxColumn ? props.rowSelection ? props.rowSelection : rowSelection : false //行选中
     ,
-    param: dataParam,
+    param: dataParam
+    //@ts-ignore
+    ,
+    search: props.search || false
+    //@ts-ignore
+    ,
+    rowKey: props.rowKey || "innerId" //行标识（配置rowSelection时使用
+    //@ts-ignore）
+    ,
+    onChange: props.onChange || onChangeTable //过滤
+    ,
+    options: {
+      reload: true,
+      setting: true,
+      sso: true,
+      density: false
+    },
+    pagination: {
+      //hideOnSinglePage:true,
+      current: pageInfo.current,
+      showSizeChanger: true,
+      pageSize: pageInfo.pageSize,
+      pageSizeOptions: [10, 20, 50, 100, 500]
+    },
+    permission: true,
+    ghost: true
+  }, props, {
+    //传递的其他属性
     toolBarRender: function toolBarRender() {
       var res = props.toolBarRender == undefined ? [] : props.toolBarRender();
       return [].concat(_toConsumableArray(res), [props.searchHigh ? isSearchFilterHaveData() ? /*#__PURE__*/React.createElement(_Button, {
@@ -488,8 +520,8 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
         onClick: function onClick(e) {
           var _filterDrawerRef$curr;
           e.stopPropagation();
-          onSearchFinish({});
           (_filterDrawerRef$curr = filterDrawerRef.current) === null || _filterDrawerRef$curr === void 0 || _filterDrawerRef$curr.resetFields();
+          onSearchFinish({});
         }
       })))) : /*#__PURE__*/React.createElement(_Tooltip, {
         title: "\u9AD8\u7EA7\u641C\u7D22"
@@ -501,37 +533,12 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
         style: {
           fontSize: 16,
           cursor: 'pointer',
-          color: isSearchFilterHaveData() ? '#1890FF' : '#000'
+          color: isSearchFilterHaveData() ? '#1890FF' : '#2e2d2d'
         }
       })) : null]);
     }
-    //@ts-ignore
-    ,
-    search: props.search || false
-    //@ts-ignore
-    ,
-    rowKey: props.rowKey || "innerId" //行标识（配置rowSelection时使用
-    //@ts-ignore）
-    ,
-    onChange: props.onChange || onChangeTable //过滤
-    ,
-    options: {
-      reload: true,
-      setting: true,
-      sso: true,
-      density: false
-    },
-    pagination: {
-      //hideOnSinglePage:true,
-      current: pageInfo.current,
-      showSizeChanger: true,
-      pageSize: pageInfo.pageSize,
-      pageSizeOptions: [10, 20, 50, 100, 500]
-    },
-    ghost: true
-  }, props, {
-    //传递的其他属性
     //toolBarRender={() =>toolsAndOptions.tools}
+    ,
     request: function request(params) {
       return (
         //@ts-ignore
@@ -546,12 +553,12 @@ var VenusTable = /*#__PURE__*/forwardRef(function (props, ref) {
               ...props.otherParams    //其他参数
           },*/
           // 表头过滤参数[必须]
-          headFilterParams: _objectSpread(_objectSpread(_objectSpread({
+          headFilterParams: _objectSpread(_objectSpread(_objectSpread(_objectSpread({
             //菜单标识，做数据权限
             menuId: getMenuId() + props.dataSceneIid + tableKey,
             // 表格场景标识[必须]
             dataSceneIid: props.dataSceneIid
-          }, props.otherParams), dataParam), params)
+          }, props.otherParams), dataParam), searchFilters), params)
         })
       );
     } //加载数据的方法

package/dist/VenusTable/staticAttr.js

@@ -26,7 +26,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from "react";
-import { getColumnDateSearchProps, handleDataIndex, assemblyFilterData, getColumnNumberSearchProps, dataToEnum, DownLoad, downloadFile, isVenusStrNotNull, IconFont, checkPathname, handleNameAndIdSplit, getUserFormate } from "./..";
+import { getColumnDateSearchProps, handleDataIndex, assemblyFilterData, getColumnNumberSearchProps, dataToEnum, DownLoad, downloadFile, isVenusStrNotNull, IconFont, checkPathname, handleNameAndIdSplit, getUserFormate, DownLoadFile } from "./..";
 import { getColumnSearchNewProps } from "../SearchHight";
 import { assemblyVirtFilterData } from "./handleVenusTableFunctions";
 import SelectUDRBySecLevelId from "../SelectCompoments/SelectUserOrDeptBySeclevel";
@@ -367,7 +367,9 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
       } else {
         console.log('数据不是一个数组');
       }
-      return [/*#__PURE__*/React.createElement(DownLoad, {
+      return [/*#__PURE__*/React.createElement(DownLoadFile
+      //@ts-ignore
+      , {
         hideProgress: true,
         params: {
           method: 'get'
@@ -385,7 +387,9 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
     return function (text, record) {
       var fileData = isVenusStrNotNull(text) && text != "-" ? JSON.parse(text) : null;
       return [fileData && fileData.length > 0 ? fileData.map(function (v, n) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DownLoad, {
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DownLoadFile
+        //@ts-ignore
+        , {
           hideProgress: true,
           params: {
             method: 'get'
@@ -532,7 +536,7 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
       /* 统一回写 */
       var finishEdit = function finishEdit(newVal) {
         actions.toggleEdit(key, false);
-        actions.onUpdateFields(column.fieldId, column.formUnitType, newVal, record.innerId, record);
+        actions.onUpdateFieldValues(column.fieldId, column.formUnitType, newVal, record.innerId, record);
       };
       var cellStyle = {};
       if (actions.getVenusEditCellStyle) {
@@ -565,15 +569,15 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
         style: {
           width: '100%'
         },
-        onChange: function onChange(v) {
-          return finishEdit(v);
-        },
         options: assemblyVirtFilterData(column.selectSource || [])
       }, actions.commonProps);
 
       /* 需要 onChange 的组件 */
       var changeTypes = ['Select', 'SecurityLevel', 'DatePicker', 'UserPicker', 'DeptPicker', 'CustomComponent'];
       if (changeTypes.includes(column.formUnitType || "Input")) {
+        commonProps.onChange = function (v) {
+          return finishEdit(v);
+        };
         if (column.formUnitType == "DatePicker") {
           //@ts-ignore
           commonProps.value = dayjs(record[column.fieldId]);
@@ -583,15 +587,17 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
           var nameAndId = handleNameAndIdSplit(column.fieldId);
           var data = getUserFormate(record, nameAndId[0], nameAndId[1]);
           commonProps.defaultSearchType = column.formUnitType == "DeptPicker" ? "dept" : "user";
+          commonProps.onChange = function (v) {
+            return finishEdit(v);
+          };
           commonProps.secId = "-1";
           commonProps.handleCancel = function () {
             actions.toggleEdit(key, false);
           };
           commonProps.value = data[nameAndId[1]];
         } else {
-          commonProps.onBlur = function () {
-            var _commonProps$value;
-            return finishEdit((_commonProps$value = commonProps.value) !== null && _commonProps$value !== void 0 ? _commonProps$value : text);
+          commonProps.onBlur = function (v) {
+            return finishEdit(v.target.value);
           }; // 保险：失焦也触发
         }
       } else {

package/dist/VenusTable/style.css

@@ -1,7 +1,3 @@
-.venus-table-exist-filter:hover .venus-table-exist-filter-icon{
-    display: block;
-}
-
-.venus-table-exist-filter-icon{
-    display: none;
+.venus-table-exist-filter{
+    display: flex;
 }

package/dist/VenusUploadSecLevel/index.js

@@ -39,6 +39,7 @@ var Item = _Form.Item;
 import { updateFileSecLevelNew } from "./service";
 var Dragger = _Upload.Dragger;
 var VenusUploadSecLevel = function VenusUploadSecLevel(props) {
+  console.log(props);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     fileList = _useState2[0],

package/dist/index.d.ts

@@ -12,7 +12,7 @@ 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 { getUserInfo, getLockScreenTime, getMenuConfig, addMenuConfig, editMenuConfig, getUserMenu, getMenus, getDifyConfigs, deleteFile, validateLogin, deleteNewFile, downloadFile, venusAi, uploadFile, updateSecLevelId, fileByAssId, mnLoginDify, refreshTokenFn, getFileData, getUserOrgTreeList, getRoleList, getVenusAdjust, getColumnData, getFormData, getFormScripts, 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';
 export { LIVE_ACCESS_TOKEN, LIVE_REFRESH_TOKEN, VENUS_PROJECT_INFO, LIVE_ACCESS_TOKEN_EXPIRES_TIME, LIVE_REFRESH_TOKEN_EXPIRES_TIME, HISTORY_PATHNAME, QUICK_ENTRY_OPEN, DATE_FORMAT, DATETIME_FORMAT, SPECIAL_DATETIME_FORMAT, SPECIAL_DATETIME_FORMAT_30, SPECIAL_DATETIME_FORMAT_00, ADMIN_APP_TOKEN, BUCKET, chromeWin32, chromeWin64, MAX_SIZE, chromeMac } from './Config/constants';

package/dist/index.js

@@ -13,7 +13,7 @@ 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 { getUserInfo, getLockScreenTime, getMenuConfig, addMenuConfig, editMenuConfig, getUserMenu, getMenus, getDifyConfigs, deleteFile, validateLogin, deleteNewFile, downloadFile, venusAi, uploadFile, updateSecLevelId, fileByAssId, mnLoginDify, refreshTokenFn, getFileData, getUserOrgTreeList, getRoleList, getVenusAdjust, getColumnData, getFormData, getFormScripts, 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";
 export { LIVE_ACCESS_TOKEN, LIVE_REFRESH_TOKEN, VENUS_PROJECT_INFO, LIVE_ACCESS_TOKEN_EXPIRES_TIME, LIVE_REFRESH_TOKEN_EXPIRES_TIME, HISTORY_PATHNAME, QUICK_ENTRY_OPEN, DATE_FORMAT, DATETIME_FORMAT, SPECIAL_DATETIME_FORMAT, SPECIAL_DATETIME_FORMAT_30, SPECIAL_DATETIME_FORMAT_00, ADMIN_APP_TOKEN, BUCKET, chromeWin32, chromeWin64, MAX_SIZE, chromeMac } from "./Config/constants";

package/package.json

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