venus-design 1.1.11 → 1.1.14

package/dist/Config/utils.js

@@ -638,10 +638,7 @@ export var builtInMap = {
     return (dayjs().month() >= 3 ? dayjs().year() : dayjs().year() - 1).toString();
   },
   // 财年（3 月起）
-  uuid: function uuid() {
-    return crypto.randomUUID();
-  },
-  // RFC4122 v4
+  //uuid:          () => crypto.randomUUID(),                          // RFC4122 v4
   random6: function random6() {
     return String(Math.floor(Math.random() * 1e6)).padStart(6, '0');
   },

package/dist/ProForm/index.js

@@ -55,7 +55,7 @@ var _excluded = ["children", "pageLoading", "pageFormClassName", "submitter", "s
   _excluded27 = ["comAttr", "valueEnum", "options", "placeholder", "disabled"],
   _excluded28 = ["comAttr", "valueEnum", "options", "placeholder", "disabled"],
   _excluded29 = ["comAttr", "placeholder", "disabled", "minRows"],
-  _excluded30 = ["comAttr", "placeholder", "span", "disabled"],
+  _excluded30 = ["comAttr", "placeholder", "disabled"],
   _excluded31 = ["comAttr", "placeholder", "disabled", "isDuo"],
   _excluded32 = ["comAttr", "placeholder", "disabled", "unit", "unitName"],
   _excluded33 = ["comAttr", "placeholder", "disabled"],
@@ -544,16 +544,25 @@ export var VenusFormSelect = function VenusFormSelect(props) {
     disabled = props.disabled,
     key = props.key,
     others = _objectWithoutProperties(props, _excluded23);
+  // 过滤函数：检查值是否在排除列表中
+  var isVisible = function isVisible(value) {
+    var _comAttr$excludedValu;
+    return !(comAttr !== null && comAttr !== void 0 && (_comAttr$excludedValu = comAttr.excludedValues) !== null && _comAttr$excludedValu !== void 0 && _comAttr$excludedValu.includes(value));
+  };
   var renderOps = function renderOps() {
     if (options) {
-      return options.map(function (ls) {
+      return options.filter(function (ls) {
+        return isVisible(ls.value);
+      }).map(function (ls) {
         return /*#__PURE__*/React.createElement(_Select.Option, {
           value: ls.value,
           key: ls.value
         }, ls.label);
       });
     }
-    return Object.keys(valueEnum).map(function (ls) {
+    return Object.keys(valueEnum).filter(function (ls) {
+      return isVisible(ls);
+    }).map(function (ls) {
       return /*#__PURE__*/React.createElement(_Select.Option, {
         value: ls,
         key: ls
@@ -714,7 +723,6 @@ export var VenusFormNumber = function VenusFormNumber(props) {
   var _props$comAttr25 = props.comAttr,
     comAttr = _props$comAttr25 === void 0 ? {} : _props$comAttr25,
     placeholder = props.placeholder,
-    span = props.span,
     disabled = props.disabled,
     others = _objectWithoutProperties(props, _excluded30);
   return /*#__PURE__*/React.createElement(FormItem2, others, /*#__PURE__*/React.createElement(_InputNumber, _extends({

package/dist/VenusTable/staticAttr.js

@@ -410,31 +410,33 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
   },
   "renderStatus": function renderStatus(column, actions) {
     return function (text, record, _, action) {
-      return [record.approvalState == "DRAFT" ? /*#__PURE__*/React.createElement(_Badge, {
+      //@ts-ignore
+      var approvalState = record[column.fieldId];
+      return [record[approvalState] == "DRAFT" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgb(255, 183, 0)",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.approvalState == "ADJUSTAPPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : record[approvalState] == "ADJUSTAPPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgba(255, 0, 119, 0.89)",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.approvalState == "APPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : record[approvalState] == "APPROVAL" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgb(255, 0, 72)",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.approvalState == "COMPLETED" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : record[approvalState] == "COMPLETED" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgb(0, 255, 119)",
         text: text,
         style: {
           marginRight: 3
         }
-      }) : record.approvalState == "DISAGREE" ? /*#__PURE__*/React.createElement(_Badge, {
+      }) : record[approvalState] == "DISAGREE" ? /*#__PURE__*/React.createElement(_Badge, {
         color: "rgb(0, 217, 255)",
         text: text,
         style: {
@@ -554,13 +556,13 @@ export var VENUS_TABLE_COLUMNRENDER_TYPE = {
       if (!Component) return /*#__PURE__*/React.createElement("span", null, text); // 没配就回退纯文本
 
       /* 公共属性 */
-      var commonProps = {
+      var commonProps = _objectSpread({
         autoFocus: true,
         defaultValue: text,
         style: {
           width: '100%'
         }
-      };
+      }, actions.commonProps);
 
       /* 需要 onChange 的组件 */
       var changeTypes = ['Select', 'SecurityLevel', 'DatePicker', 'UserPicker', 'DeptPicker'];

package/package.json

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