venus-design 1.1.21 → 1.1.24

package/dist/DataView/resizable/index.js

@@ -30,7 +30,8 @@ import { ProTable } from '@ant-design/pro-components';
 import { SlidersOutlined } from '@ant-design/icons';
 import { saveAs } from "file-saver";
 import * as ExcelJs from 'exceljs';
-import { DrawerDataAuth } from "../..";
+import { DrawerDataAuth, storage } from "../..";
+import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
 
 // 拖拽辅助线
 var ResizeGuideLine = function ResizeGuideLine(_ref) {
@@ -108,7 +109,8 @@ var ResizableTabel = function ResizableTabel(props) {
   var sceneId = props.dataSceneIid || "";
   var tableContainerRef = useRef(null);
   var resizeDataRef = useRef(null);
-
+  var tableKey = props.key || "";
+  var drawerKey = tableKey + sceneId;
   // 获取 AntD 内部滚动层
   //@ts-ignore
   var getScrollEl = function getScrollEl() {
@@ -343,9 +345,16 @@ var ResizableTabel = function ResizableTabel(props) {
       }
     }
   };
+  //只要venus用户能看见权限配置按钮
+  var userInfo = storage.getSessionItem("user");
   //是否有权限
   var hasPermission = props.permission || props.permissionViewFn != undefined && props.permissionViewFn();
   return /*#__PURE__*/React.createElement("div", {
+    id: "VenusProTable"
+  }, /*#__PURE__*/React.createElement(StyleProvider, {
+    hashPriority: "high",
+    transformers: [legacyLogicalPropertiesTransformer]
+  }, /*#__PURE__*/React.createElement("div", {
     ref: tableContainerRef,
     style: {
       width: '100%',
@@ -389,7 +398,7 @@ var ResizableTabel = function ResizableTabel(props) {
         onClick: function onClick() {
           return getData(pageSizeG);
         }
-      }, props.exportButtonConfig), "\u5BFC\u51FA")].concat(_toConsumableArray(res), [hasPermission && /*#__PURE__*/React.createElement(_Tooltip, {
+      }, props.exportButtonConfig), "\u5BFC\u51FA")].concat(_toConsumableArray(res), [hasPermission && userInfo && userInfo.username == "venus" && /*#__PURE__*/React.createElement(_Tooltip, {
         title: "\u6743\u9650\u914D\u7F6E"
       }, /*#__PURE__*/React.createElement(SlidersOutlined, {
         onClick: function onClick() {
@@ -404,11 +413,11 @@ var ResizableTabel = function ResizableTabel(props) {
     }
   })), /*#__PURE__*/React.createElement(DrawerDataAuth, {
     open: qxVisible,
-    key: props.key + sceneId,
+    venuskey: drawerKey,
     onClose: function onClose() {
       return setQxVisible(false);
     },
     title: "\u6743\u9650\u914D\u7F6E"
-  }));
+  }))));
 };
 export default ResizableTabel;

package/dist/Drawer/index.js

@@ -91,7 +91,7 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     isEdit = _useState6[0],
     setisEdit = _useState6[1];
-  var key = props.key || "";
+  var key = props.venuskey || "";
   var _Form$useForm = _Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -137,8 +137,10 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
    * 监听抽屉展开，查询数据，表单回显
    */
   useEffect(function () {
-    getData(getMenuId() + key);
-  }, []);
+    if (props.open) {
+      getData(getMenuId() + key);
+    }
+  }, [props.open]);
 
   /**
    * 保存
@@ -190,6 +192,7 @@ export default /*#__PURE__*/React.forwardRef(function (props, ref) {
       destroyOnClose: true,
       onClose: function onClose() {
         props.onClose(false);
+        form.resetFields();
       }
     },
     width: 300,

package/dist/ProForm/index.d.ts

@@ -40,12 +40,24 @@ export declare const VenusFormSelect: (props: any) => React.JSX.Element;
  * @returns
  */
 export declare const VenusFormText: (props: any) => React.JSX.Element;
+type DefaultValueType = 'now' | 'today' | 'yesterday' | 'tomorrow' | 'startOfMonth' | 'endOfMonth' | 'startOfYear' | 'endOfYear' | 'firstDayOfWeek' | 'lastDayOfWeek' | string;
+interface VenusFormDatePickerProps {
+    comAttr?: {
+        defaultValue?: DefaultValueType;
+        format?: string;
+        showTime?: boolean;
+        [key: string]: any;
+    };
+    placeholder?: string;
+    disabled?: boolean;
+    [key: string]: any;
+}
 /**
  * 选择时间
  * @param props
  * @returns
  */
-export declare const VenusFormDatePicker: (props: any) => React.JSX.Element;
+export declare const VenusFormDatePicker: (props: VenusFormDatePickerProps) => React.JSX.Element;
 /**
  * 选择时间
  * @param props
@@ -53,7 +65,7 @@ export declare const VenusFormDatePicker: (props: any) => React.JSX.Element;
  */
 export declare const VenusFormDateRangePicker: (props: any) => React.JSX.Element;
 /**
- * 选择时间
+ * 选择数字区间
  * @param props
  * @returns
  */

package/dist/ProForm/index.js

@@ -51,25 +51,32 @@ var _excluded = ["children", "pageLoading", "pageFormClassName", "submitter", "s
   _excluded23 = ["comAttr", "valueEnum", "options", "placeholder", "labelInValue", "disabled", "key"],
   _excluded24 = ["comAttr", "placeholder", "disabled", "defaultValue"],
   _excluded25 = ["comAttr", "placeholder", "disabled"],
-  _excluded26 = ["comAttr", "placeholder", "disabled"],
+  _excluded26 = ["defaultValue", "format", "showTime"],
   _excluded27 = ["comAttr", "placeholder", "disabled"],
-  _excluded28 = ["comAttr", "radioAttr", "valueEnum", "options", "placeholder", "disabled"],
-  _excluded29 = ["comAttr", "valueEnum", "options", "placeholder", "disabled"],
+  _excluded28 = ["comAttr", "placeholder", "disabled"],
+  _excluded29 = ["comAttr", "radioAttr", "valueEnum", "options", "placeholder", "disabled"],
   _excluded30 = ["comAttr", "valueEnum", "options", "placeholder", "disabled"],
-  _excluded31 = ["comAttr", "placeholder", "disabled", "minRows"],
-  _excluded32 = ["comAttr", "placeholder", "disabled"],
-  _excluded33 = ["comAttr", "placeholder", "disabled", "isDuo"],
-  _excluded34 = ["comAttr", "placeholder", "disabled", "unit", "unitName"],
-  _excluded35 = ["comAttr", "placeholder", "disabled"],
-  _excluded36 = ["comAttr", "placeholder", "disabled", "isDuo"],
-  _excluded37 = ["comAttr", "request", "placeholder", "disabled"],
-  _excluded38 = ["comAttr", "request", "fieldNames", "otherKeys", "placeholder", "disabled"],
+  _excluded31 = ["comAttr", "valueEnum", "options", "placeholder", "disabled"],
+  _excluded32 = ["comAttr", "placeholder", "disabled", "minRows"],
+  _excluded33 = ["comAttr", "placeholder", "disabled"],
+  _excluded34 = ["comAttr", "placeholder", "disabled", "isDuo"],
+  _excluded35 = ["comAttr", "placeholder", "disabled", "unit", "unitName"],
+  _excluded36 = ["comAttr", "placeholder", "disabled"],
+  _excluded37 = ["comAttr", "placeholder", "disabled", "isDuo"],
+  _excluded38 = ["comAttr", "request", "placeholder", "disabled"],
   _excluded39 = ["comAttr", "request", "fieldNames", "otherKeys", "placeholder", "disabled"],
-  _excluded40 = ["comAttr", "placeholder", "disabled", "isDuo"],
+  _excluded40 = ["comAttr", "request", "fieldNames", "otherKeys", "placeholder", "disabled"],
   _excluded41 = ["comAttr", "placeholder", "disabled", "isDuo"],
   _excluded42 = ["comAttr", "placeholder", "disabled", "isDuo"],
   _excluded43 = ["comAttr", "placeholder", "disabled", "isDuo"],
-  _excluded44 = ["comAttr", "placeholder", "disabled", "isDuo"];
+  _excluded44 = ["comAttr", "placeholder", "disabled", "isDuo"],
+  _excluded45 = ["comAttr", "placeholder", "disabled", "isDuo"];
+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; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -79,6 +86,7 @@ import { CheckBoxInput, NumberPercent, NumberUnit, RadioAndInput, Search, TreeSe
 import "./styles.less";
 import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
 import { ProFormDigitRange } from '@ant-design/pro-components';
+import dayjs from 'dayjs';
 var RangePicker = _DatePicker.RangePicker;
 var ProForm = function ProForm(props) {
   var children = props.children,
@@ -600,24 +608,103 @@ export var VenusFormText = function VenusFormText(props) {
     defaultValue: defaultValue
   }, comAttr)));
 };
+
+// 普通日期字符串或 dayjs 支持的格式
+
+var DEFAULT_VALUE_MAP = {
+  now: function now() {
+    return dayjs();
+  },
+  today: function today() {
+    return dayjs().startOf('day');
+  },
+  yesterday: function yesterday() {
+    return dayjs().subtract(1, 'day').startOf('day');
+  },
+  tomorrow: function tomorrow() {
+    return dayjs().add(1, 'day').startOf('day');
+  },
+  startOfMonth: function startOfMonth() {
+    return dayjs().startOf('month');
+  },
+  endOfMonth: function endOfMonth() {
+    return dayjs().endOf('month');
+  },
+  startOfYear: function startOfYear() {
+    return dayjs().startOf('year');
+  },
+  endOfYear: function endOfYear() {
+    return dayjs().endOf('year');
+  },
+  firstDayOfWeek: function firstDayOfWeek() {
+    return dayjs().startOf('week').add(1, 'day');
+  },
+  // dayjs 默认周日为一周开始，+1 调整为周一
+  lastDayOfWeek: function lastDayOfWeek() {
+    return dayjs().endOf('week').add(1, 'day');
+  }
+};
+
 /**
  * 选择时间
  * @param props 
  * @returns 
  */
+
 export var VenusFormDatePicker = function VenusFormDatePicker(props) {
   var _props$comAttr20 = props.comAttr,
     comAttr = _props$comAttr20 === void 0 ? {} : _props$comAttr20,
     placeholder = props.placeholder,
     disabled = props.disabled,
     others = _objectWithoutProperties(props, _excluded25);
+  var defaultValue = comAttr.defaultValue,
+    format = comAttr.format,
+    showTime = comAttr.showTime,
+    restComAttr = _objectWithoutProperties(comAttr, _excluded26);
+
+  // 解析默认值
+  var resolveDefaultValue = function resolveDefaultValue(val) {
+    if (val === undefined || val === null || val === '') return undefined;
+
+    // 预定义关键字
+    if (typeof val === 'string' && DEFAULT_VALUE_MAP[val]) {
+      return DEFAULT_VALUE_MAP[val]();
+    }
+
+    // 相对时间表达式：+1d, -3m, +2y
+    if (typeof val === 'string' && /^[+-]\d+[dmyw]$/.test(val)) {
+      var match = val.match(/^([+-])(\d+)([dmyw])$/);
+      if (match) {
+        var _match = _slicedToArray(match, 4),
+          sign = _match[1],
+          num = _match[2],
+          unit = _match[3];
+        var amount = sign === '+' ? parseInt(num) : -parseInt(num);
+        var dayjsUnit = {
+          d: 'day',
+          m: 'month',
+          y: 'year',
+          w: 'week'
+        }[unit];
+        return dayjs().add(amount, dayjsUnit);
+      }
+    }
+
+    // 普通日期字符串
+    return dayjs(val);
+  };
+  var resolvedValue = resolveDefaultValue(defaultValue);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_DatePicker, _extends({
     style: {
       width: '100%'
     },
     placeholder: placeholder,
-    disabled: disabled
-  }, comAttr)));
+    disabled: disabled,
+    format: format,
+    showTime: showTime
+  }, restComAttr, {
+    defaultValue: resolvedValue
+  })));
 };
 /**
  * 选择时间
@@ -629,7 +716,7 @@ export var VenusFormDateRangePicker = function VenusFormDateRangePicker(props) {
     comAttr = _props$comAttr21 === void 0 ? {} : _props$comAttr21,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded26);
+    others = _objectWithoutProperties(props, _excluded27);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(RangePicker, _extends({
     style: {
       width: '100%'
@@ -639,7 +726,7 @@ export var VenusFormDateRangePicker = function VenusFormDateRangePicker(props) {
   }, comAttr)));
 };
 /**
- * 选择时间
+ * 选择数字区间
  * @param props 
  * @returns 
  */
@@ -648,7 +735,7 @@ export var VenusFormNumberRange = function VenusFormNumberRange(props) {
     comAttr = _props$comAttr22 === void 0 ? {} : _props$comAttr22,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded27);
+    others = _objectWithoutProperties(props, _excluded28);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(ProFormDigitRange, _extends({
     placeholder: placeholder,
     disabled: disabled
@@ -670,7 +757,7 @@ export var VenusFormRadioGroup = function VenusFormRadioGroup(props) {
     options = props.options,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded28);
+    others = _objectWithoutProperties(props, _excluded29);
   var renderOps = function renderOps() {
     if (options) {
       return options.map(function (ls) {
@@ -700,7 +787,7 @@ export var VenusFormCheckBoxInputGroup = function VenusFormCheckBoxInputGroup(pr
     options = props.options,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded29);
+    others = _objectWithoutProperties(props, _excluded30);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(CheckBoxInput, props));
 };
 /**
@@ -714,7 +801,7 @@ export var VenusFormCheckBoxGroup = function VenusFormCheckBoxGroup(props) {
     options = props.options,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded30);
+    others = _objectWithoutProperties(props, _excluded31);
   var renderOps = function renderOps() {
     if (options) {
       return options.map(function (ls) {
@@ -743,7 +830,7 @@ export var VenusFormTextarea = function VenusFormTextarea(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     minRows = props.minRows,
-    others = _objectWithoutProperties(props, _excluded31);
+    others = _objectWithoutProperties(props, _excluded32);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_Input.TextArea, _extends({
     autoSize: {
       minRows: minRows ? minRows : 3
@@ -763,7 +850,7 @@ export var VenusFormNumber = function VenusFormNumber(props) {
     comAttr = _props$comAttr27 === void 0 ? {} : _props$comAttr27,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded32);
+    others = _objectWithoutProperties(props, _excluded33);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_InputNumber, _extends({
     style: {
       width: "100%",
@@ -784,7 +871,7 @@ export var VenusFormUploadImage = function VenusFormUploadImage(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded33);
+    others = _objectWithoutProperties(props, _excluded34);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(UploadImage, _extends({
     placeholder: placeholder,
     disabled: disabled
@@ -802,7 +889,7 @@ export var VenusFormNumberUnit = function VenusFormNumberUnit(props) {
     disabled = props.disabled,
     unit = props.unit,
     unitName = props.unitName,
-    others = _objectWithoutProperties(props, _excluded34);
+    others = _objectWithoutProperties(props, _excluded35);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(NumberUnit, _extends({
     unitName: unitName,
     unit: unit,
@@ -820,7 +907,7 @@ export var VenusFormNumberPercent = function VenusFormNumberPercent(props) {
     comAttr = _props$comAttr30 === void 0 ? {} : _props$comAttr30,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded35);
+    others = _objectWithoutProperties(props, _excluded36);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(NumberPercent, _extends({
     placeholder: placeholder,
     disabled: disabled
@@ -837,7 +924,7 @@ export var VenusFormUpload = function VenusFormUpload(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded36);
+    others = _objectWithoutProperties(props, _excluded37);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(Upload, _extends({
     placeholder: placeholder,
     isDuo: isDuo,
@@ -855,7 +942,7 @@ export var VenusFormTreeSelect = function VenusFormTreeSelect(props) {
     request = props.request,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded37);
+    others = _objectWithoutProperties(props, _excluded38);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(TreeSelect, _extends({
     request: request,
     placeholder: placeholder,
@@ -875,7 +962,7 @@ export var VenusFormSearch = function VenusFormSearch(props) {
     otherKeys = props.otherKeys,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded38);
+    others = _objectWithoutProperties(props, _excluded39);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(Search, _extends({
     request: request,
     placeholder: placeholder,
@@ -897,7 +984,7 @@ export var VenusFormSwitch = function VenusFormSwitch(props) {
     otherKeys = props.otherKeys,
     placeholder = props.placeholder,
     disabled = props.disabled,
-    others = _objectWithoutProperties(props, _excluded39);
+    others = _objectWithoutProperties(props, _excluded40);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_Switch, _extends({
     disabled: disabled
   }, comAttr)));
@@ -913,7 +1000,7 @@ export var VenusFormRate = function VenusFormRate(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded40);
+    others = _objectWithoutProperties(props, _excluded41);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_Rate, _extends({
     disabled: disabled
   }, comAttr)));
@@ -929,7 +1016,7 @@ export var VenusFormSlider = function VenusFormSlider(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded41);
+    others = _objectWithoutProperties(props, _excluded42);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_Slider, _extends({
     disabled: disabled
   }, comAttr)));
@@ -946,7 +1033,7 @@ export var VenusFormUploadPro = function VenusFormUploadPro(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded42);
+    others = _objectWithoutProperties(props, _excluded43);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(VenusUploadSecLevelForm, _extends({
     placeholder: placeholder,
     isDuo: isDuo,
@@ -964,7 +1051,7 @@ export var VenusFormEditor = function VenusFormEditor(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded43);
+    others = _objectWithoutProperties(props, _excluded44);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(VenusEditor, _extends({
     disabled: disabled
   }, comAttr)));
@@ -978,7 +1065,7 @@ export var VenusFormUploadSecLevel = function VenusFormUploadSecLevel(props) {
     placeholder = props.placeholder,
     disabled = props.disabled,
     isDuo = props.isDuo,
-    others = _objectWithoutProperties(props, _excluded44);
+    others = _objectWithoutProperties(props, _excluded45);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(VenusUploadSecLevel, _extends({
     placeholder: placeholder,
     isDuo: isDuo,

package/dist/RadioAndInput/index.js

@@ -86,6 +86,7 @@ var RadioAndInput = function RadioAndInput(props) {
     },
     onChange: onRadio,
     value: value,
+    defaultValue: props.defaultValue,
     placeholder: placeholder,
     disabled: disabled
   }, comAttr), renderOps()), radioAttr.showFlag ? /*#__PURE__*/React.createElement(_Input, _extends({}, radioAttr, {

package/dist/SelectCompoments/SelectUserOrDeptBySeclevel/selectPanel/dept.js

@@ -7,8 +7,6 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/tree/style";
 import _Tree from "antd/es/tree";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -90,7 +88,9 @@ var VenusDept = function VenusDept(props) {
   var onSelect = function onSelect(selectedKey, e) {
     if (selectedKey.length > 1) {
       if (!props.isMultiple) {
-        _message.warning("不能多选！");
+        setSelectedKeys([selectedKey[selectedKey.length - 1]]);
+        var selectData = e.selectedNodes[e.selectedNodes.length - 1];
+        setSelectRows([selectData]);
       } else {
         setSelectedKeys(selectedKey);
         setSelectRows(e.selectedNodes);
@@ -212,7 +212,7 @@ var VenusDept = function VenusDept(props) {
     onSelect: onSelect,
     blockNode: true,
     multiple: true,
-    defaultExpandAll: true
+    defaultExpandedKeys: [1]
     //selectable={false}
     ,
     height: 364,

package/dist/SelectCompoments/SelectUserOrDeptBySeclevel/selectPanel/user.js

@@ -222,19 +222,20 @@ var VenusUser = function VenusUser(props) {
     var user = info.node,
       selectedFlag = info.selected;
     if (user.type === "dept") {
-      var deptKeysSet = new Set([].concat(_toConsumableArray(selectedDepartments), _toConsumableArray(selectedKeys), _toConsumableArray(dataKeysData)));
-      var updatedDeptKeys = updateSelection(deptKeysSet, user.key, selectedFlag);
-      if (updatedDeptKeys.length > 1 && !props.isMultiple) {
-        _message.warning("不能多选！");
-      } else {
-        if (props.maxSelectCount && updatedDeptKeys.length > props.maxSelectCount) {
-          _message.warning("最多选择" + props.maxSelectCount + "个部门！");
-          return;
-        }
-        setSelectedKeys(updatedDeptKeys);
-        onSelectedDepartments(updatedDeptKeys);
-        dataKeysData = updatedDeptKeys;
-      }
+      _message.warning("请选择用户！");
+      /*const deptKeysSet = new Set([...selectedDepartments, ...selectedKeys, ...dataKeysData]);
+      const updatedDeptKeys = updateSelection(deptKeysSet, user.key, selectedFlag);
+                  if (updatedDeptKeys.length > 1 && !props.isMultiple) {
+          message.warning("不能多选！");
+      } else {
+          if(props.maxSelectCount&&updatedDeptKeys.length>props.maxSelectCount){
+            message.warning("最多选择"+props.maxSelectCount+"个部门！");
+            return;
+          }
+          setSelectedKeys(updatedDeptKeys);
+          onSelectedDepartments(updatedDeptKeys);
+          dataKeysData = updatedDeptKeys;
+      }*/
     } else {
       user.name = user.title || user.username;
       var updatedUserRows = updateUserSelection(selectedRow, user, selectedFlag);
@@ -243,7 +244,10 @@ var VenusUser = function VenusUser(props) {
       })), _toConsumableArray(selectedKeysValue)));
       var updatedUserKeys = Array.from(userKeysSet);
       if (updatedUserKeys.length > 1 && !props.isMultiple) {
-        _message.warning("不能多选！");
+        var selectData = updatedUserRows[updatedUserRows.length - 1];
+        setSelectedRow([selectData]);
+        setSelectedKeys(selectedKeysValue);
+        dataKeysData = selectedKeysValue;
       } else {
         if (props.maxSelectCount && updatedUserKeys.length > props.maxSelectCount) {
           _message.warning("最多选择" + props.maxSelectCount + "个用户！");
@@ -532,7 +536,7 @@ var VenusUser = function VenusUser(props) {
   }, /*#__PURE__*/React.createElement(_Tree, {
     onSelect: onSelect,
     blockNode: true,
-    multiple: true,
+    multiple: props.isMultiple,
     defaultExpandedKeys: ["dept_1"]
     //selectable={false}
     ,

package/dist/SelectCompoments/SelectUserOrDeptBySeclevel/styles.less

@@ -37,6 +37,7 @@
     .selectUserOrDept_userTreeDivShowUserTable{
         width: 25%;
         height: 400px;
+        overflow-y:auto;
         box-shadow:0px 2px 6px 0px rgba(0,0,0,0.1);
     }
     .selectUserOrDept_userListDivShowUserTable{

package/dist/VenusAdjust/index.js

@@ -47,6 +47,9 @@ var VenusAdjust = function VenusAdjust(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     data = _useState8[0],
     setData = _useState8[1];
+  useEffect(function () {
+    setData(props.data);
+  }, [props.data]);
   /**
    * 根据场景标识查询表单对象
   */
@@ -150,11 +153,11 @@ var VenusAdjust = function VenusAdjust(props) {
     key: props.dataViewIidBefore,
     loading: false //加载中
     ,
-    dataViewIid: props.dataViewIidBefore //数据视图标识
+    dataViewIid: props.dataViewIidBefore || "" //数据视图标识
     ,
-    dataSceneIid: props.dataViewIidBefore //数据场景标识
+    dataSceneIid: props.dataSceneIidBefore || "" //数据场景标识
     ,
-    data: props.data || {} //详情数据
+    data: props.dataBefore || {} //详情数据
     ,
     dataAfter: data,
     detailColumn: detailData
@@ -177,6 +180,7 @@ var VenusAdjust = function VenusAdjust(props) {
     ,
     onFinish: ( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(v) {
+        var _props$onFinish;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -184,7 +188,7 @@ var VenusAdjust = function VenusAdjust(props) {
               return saveSubmitIng(true);
             case 2:
               _context3.next = 4;
-              return props.onFinish(v);
+              return (_props$onFinish = props.onFinish) === null || _props$onFinish === void 0 ? void 0 : _props$onFinish.call(props, v);
             case 4:
               _context3.next = 6;
               return saveSubmitIng(false);

package/dist/VenusAdjust/interface.d.ts

@@ -2,14 +2,15 @@
  * 调整组件(暂时不用)
  */
 export interface VenusAdjustInterface {
-    onFinish: Function;
-    onCancel: Function;
-    dataViewIid: string;
-    dataSceneIid: string;
-    dataViewIidBefore: string;
-    dataSceneIidBefore: string;
-    data: object;
-    formData: [];
+    onFinish?: Function;
+    onCancel?: Function;
+    dataViewIid?: string;
+    dataSceneIid?: string;
+    dataViewIidBefore?: string;
+    dataBefore?: object;
+    dataSceneIidBefore?: string;
+    data?: object;
+    formData?: [];
     form?: any;
-    detailData: [];
+    detailData?: [];
 }

package/dist/VenusDesignCom/components/Form.js

@@ -88,7 +88,7 @@ var VenusDesignForm = /*#__PURE__*/forwardRef(function (props, ref) {
   var onValuesChange = function onValuesChange(values, allValues) {
     var _formRef$current;
     var formData = ((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFormDataField()) || [];
-    var data = setVenusFormFormate(formData, values);
+    var data = setVenusFormFormate(formData, allValues);
     if (props.conf.type != "view") {
       var cleaned = Object.fromEntries(Object.entries(data).filter(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),