@bchr/bchr-front-lib 0.5.4 → 0.5.6

package/lib/base/layout/ActionButton.js

@@ -74,6 +74,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
   var icon = props.icon;
   var btnLabel = props.btnText;
   var type = "tertiary";
+  var typeClassName = "default-btn";
   var theme = "light";
   var confirmMsg = null;
   var confirmType = null;
@@ -87,6 +88,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.PlusOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "新增";
         type = "primary";
+        typeClassName = "default-btn";
         theme = "solid";
         break;
       }
@@ -96,6 +98,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.BarsOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "浏览";
         type = "primary";
+        typeClassName = "default-btn";
         theme = "solid";
         break;
       }
@@ -112,6 +115,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.SaveOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "保存";
         type = "primary";
+        typeClassName = "completed-save-btn";
         theme = "solid";
         break;
       }
@@ -121,6 +125,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.UnorderedListOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "选择";
         type = "primary";
+        typeClassName = "default-btn";
         theme = "solid";
         break;
       }
@@ -143,6 +148,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.DeleteOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "删除";
         type = "danger";
+        typeClassName = "danger-btn";
         theme = "solid";
         confirmMsg = "确定要删除[options]记录吗?";
         break;
@@ -153,6 +159,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.StopOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "终止";
         type = "danger";
+        typeClassName = "danger-btn";
         theme = "solid";
         confirmMsg = "确定要终止[options]记录吗?";
         break;
@@ -190,6 +197,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
       {
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.UndoOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "返回";
+        typeClassName = "default-return-btn";
         break;
       }
 
@@ -198,6 +206,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.CheckSquareOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "确定";
         type = "primary";
+        typeClassName = "completed-btn";
         theme = "solid";
         break;
       }
@@ -207,6 +216,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.SwapLeftOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "取消";
         type = "warning";
+        typeClassName = "completed-save-btn";
         confirmMsg = "确定要取消[options]吗?";
         theme = "solid";
         break;
@@ -231,6 +241,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.SendOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "提交";
         type = "primary";
+        typeClassName = "completed-submit-btn";
         theme = "solid";
         break;
       }
@@ -243,6 +254,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         confirmMsg = "确定要收回[options]吗?";
         theme = "solid";
         type = "primary";
+        typeClassName = "completed-save-btn";
         break;
       }
 
@@ -251,6 +263,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.CheckCircleOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "审批";
         type = "warning";
+        typeClassName = "completed-save-btn";
         break;
       }
 
@@ -260,6 +273,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         type = "warning";
         btnLabel = hasBtnLabel ? props.btnText : "驳回";
         theme = "solid";
+        typeClassName = "completed-save-btn";
         break;
       }
 
@@ -295,6 +309,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
       {
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.CheckCircleOutlined, null);
         type = hasBtnLabel ? props.btnText : "warning";
+        typeClassName = "completed-save-btn";
         btnLabel = "撤销生效";
         confirmMsg = "确定要撤销生效[options]吗?";
         theme = "solid";
@@ -368,6 +383,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
       {
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.LockOutlined, null);
         type = "warning";
+        typeClassName = "completed-save-btn";
         btnLabel = hasBtnLabel ? props.btnText : "禁用";
         theme = "solid";
         confirmMsg = "确定要禁用[options]记录吗?";
@@ -393,6 +409,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         icon = icon ? icon : /*#__PURE__*/_react["default"].createElement(_icons.ClearOutlined, null);
         btnLabel = hasBtnLabel ? props.btnText : "清除";
         type = "warning";
+        typeClassName = "completed-save-btn";
         theme = "solid";
         break;
       }
@@ -429,6 +446,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
   if (!buttonProps.icon) buttonProps.icon = icon;
   if (!buttonProps.type) buttonProps.type = type;
   if (!buttonProps.theme) buttonProps.theme = theme;
+  if (!buttonProps.className) buttonProps.className = typeClassName;
 
   if (innerLine) {
     if (!buttonProps.size) {
@@ -437,12 +455,12 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
   }
 
   if (confirmMsg && confirmMsg.trim().length > 0 && typeof buttonProps.onClick === "function") {
-    if (_utils.Values.isEmpty(buttonProps.checkField) || _utils.Values.isEmpty(buttonProps.checkData)) {
+    if (_utils.Values.isEmpty(buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.checkField) || _utils.Values.isNull(buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.checkData)) {
       throw new Error("Please enter the check field and table data before transmitting the check field and table data");
     }
 
-    checkField = buttonProps.checkField;
-    checkData = buttonProps.checkData;
+    checkField = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.checkField;
+    checkData = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.checkData;
     var onClickHandler = buttonProps.onClick;
     var onCancelHandler = buttonProps.onCancel;
     var modalOptions = {
@@ -461,13 +479,13 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
     };
 
     buttonProps.onClick = function () {
-      if (_utils.Values.isEmpty(checkField) || _utils.Values.isEmpty(checkData)) {
+      if (_utils.Values.isBlankString(checkField) || _utils.Values.isEmptyArray(checkData)) {
         throw new Error("Please enter the check field and table data before transmitting the check field and table data");
       }
 
       var checkedNames = [];
 
-      if (_utils.Values.isNotEmpty(checkField) && _utils.Values.isNotEmpty(checkData)) {
+      if (_utils.Values.isNotEmpty(checkField) && _utils.Values.isNotNull(checkData)) {
         if (Array.isArray(checkData)) {
           var selectedData = checkData.filter(function (item) {
             return item.selected;
@@ -487,7 +505,7 @@ var buildActionButton = function buildActionButton(props, subActionButton, inner
         }
       }
 
-      modalOptions.content.replace('[options]', checkedNames.join(','));
+      modalOptions.content = modalOptions.content.replace('[options]', checkedNames.join(','));
 
       if (confirmType) {
         if (confirmType === 'danger') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/layout/ActionButton.js

@@ -81,12 +81,13 @@ const buildActionButton = function(props, subActionButton, innerLine) {
     let loading = props.loading != null ? props.loading : false;
     let icon        = props.icon;
     let btnLabel    = props.btnText;
-    let type        = "tertiary";
-    let theme       = "light";
-    let confirmMsg   = null;
-    let confirmType  = null;
-    let checkField   = null;
-    let checkData    = null;
+    let type         = "tertiary";
+    let typeClassName= "default-btn";
+    let theme        = "light";
+    let confirmMsg    = null;
+    let confirmType   = null;
+    let checkField    = null;
+    let checkData     = null;
     let hasBtnLabel = props.btnText !== null && props.btnText !== undefined;
 
     switch (props.actionType) {
@@ -94,6 +95,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <PlusOutlined />;
             btnLabel = hasBtnLabel ? props.btnText : "新增";
             type     = "primary";
+            typeClassName= "default-btn";
             theme    = "solid";
             break;
         }
@@ -101,6 +103,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <BarsOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "浏览";
             type     = "primary";
+            typeClassName= "default-btn";
             theme    = "solid";
             break;
         }
@@ -113,6 +116,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <SaveOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "保存";
             type     = "primary";
+            typeClassName= "completed-save-btn";
             theme    = "solid";
             break;
         }
@@ -120,6 +124,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <UnorderedListOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "选择";
             type     = "primary";
+            typeClassName= "default-btn";
             theme    = "solid";
             break;
         }
@@ -136,6 +141,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <DeleteOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "删除";
             type     = "danger";
+            typeClassName= "danger-btn";
             theme    = "solid";
             confirmMsg = "确定要删除[options]记录吗?";
             break;
@@ -144,6 +150,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <StopOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "终止";
             type     = "danger";
+            typeClassName= "danger-btn";
             theme    = "solid";
             confirmMsg = "确定要终止[options]记录吗?";
             break;
@@ -171,19 +178,22 @@ const buildActionButton = function(props, subActionButton, innerLine) {
         case ActionButtonTypes.ReturnBack : {
             icon     = icon ? icon : <UndoOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "返回";
+            typeClassName= "default-return-btn";
             break;
         }
         case ActionButtonTypes.OK : {
             icon     = icon ? icon : <CheckSquareOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "确定";
             type     = "primary";
+            typeClassName= "completed-btn";
             theme    = "solid";
             break;
         }
         case ActionButtonTypes.Cancel : {
             icon       = icon ? icon : <SwapLeftOutlined />
             btnLabel   = hasBtnLabel ? props.btnText : "取消";
-            type       = "warning"
+            type       = "warning";
+            typeClassName= "completed-save-btn";
             confirmMsg = "确定要取消[options]吗?";
             theme      = "solid";
             break;
@@ -202,6 +212,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <SendOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "提交";
             type     = "primary";
+            typeClassName= "completed-submit-btn";
             theme    = "solid";
             break;
         }
@@ -212,12 +223,14 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             confirmMsg = "确定要收回[options]吗?";
             theme      = "solid";
             type       = "primary";
+            typeClassName= "completed-save-btn";
             break;
         }
         case ActionButtonTypes.Approve : {
             icon     = icon ? icon : <CheckCircleOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "审批";
             type     = "warning"
+            typeClassName= "completed-save-btn";
             break;
         }
         case ActionButtonTypes.Reject : {
@@ -225,6 +238,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             type      = "warning";
             btnLabel  = hasBtnLabel ? props.btnText : "驳回";
             theme     = "solid";
+            typeClassName= "completed-save-btn";
             break;
         }
         case ActionButtonTypes.Export : {
@@ -249,7 +263,8 @@ const buildActionButton = function(props, subActionButton, innerLine) {
         }
         case ActionButtonTypes.Invalid : {
             icon     = icon ? icon : <CheckCircleOutlined />
-            type       = hasBtnLabel ? props.btnText : "warning"
+            type       = hasBtnLabel ? props.btnText : "warning";
+            typeClassName= "completed-save-btn";
             btnLabel   = "撤销生效";
             confirmMsg = "确定要撤销生效[options]吗?";
             theme      = "solid";
@@ -296,7 +311,8 @@ const buildActionButton = function(props, subActionButton, innerLine) {
         }
         case ActionButtonTypes.Disable : {
             icon     = icon ? icon : <LockOutlined />
-            type     = "warning"
+            type     = "warning";
+            typeClassName= "completed-save-btn";
             btnLabel = hasBtnLabel ? props.btnText : "禁用";
             theme    = "solid";
             confirmMsg = "确定要禁用[options]记录吗?";
@@ -316,6 +332,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             icon     = icon ? icon : <ClearOutlined />
             btnLabel = hasBtnLabel ? props.btnText : "清除";
             type     = "warning"
+            typeClassName= "completed-save-btn";
             theme    = "solid";
             break;
         }
@@ -355,6 +372,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
     if (!buttonProps.icon)  buttonProps.icon  = icon;
     if (!buttonProps.type)  buttonProps.type  = type;
     if (!buttonProps.theme) buttonProps.theme = theme;
+    if (!buttonProps.className) buttonProps.className = typeClassName;
 
     if (innerLine) {
         if (!buttonProps.size) {
@@ -363,12 +381,12 @@ const buildActionButton = function(props, subActionButton, innerLine) {
     }
 
     if (confirmMsg && confirmMsg.trim().length > 0 && typeof buttonProps.onClick === "function") {
-        if (Values.isEmpty(buttonProps.checkField) || Values.isEmpty(buttonProps.checkData)) {
+        if (Values.isEmpty(buttonProps?.checkField) || Values.isNull(buttonProps?.checkData)) {
             throw new Error("Please enter the check field and table data before transmitting the check field and table data");
         }
 
-        checkField = buttonProps.checkField;
-        checkData = buttonProps.checkData;
+        checkField = buttonProps?.checkField;
+        checkData = buttonProps?.checkData;
 
         let onClickHandler  = buttonProps.onClick;
         let onCancelHandler = buttonProps.onCancel;
@@ -382,12 +400,12 @@ const buildActionButton = function(props, subActionButton, innerLine) {
             okButtonProps : {type: buttonProps.type, theme : "solid", icon: <CheckOutlined />}
         };
         buttonProps.onClick = function() {
-            if (Values.isEmpty(checkField) || Values.isEmpty(checkData)) {
+            if (Values.isBlankString(checkField) || Values.isEmptyArray(checkData)) {
                 throw new Error("Please enter the check field and table data before transmitting the check field and table data");
             }
 
             let checkedNames = [];
-            if (Values.isNotEmpty(checkField) && Values.isNotEmpty(checkData)) {
+            if (Values.isNotEmpty(checkField) && Values.isNotNull(checkData)) {
                 if (Array.isArray(checkData)) {
                     let selectedData = checkData.filter(item => item.selected);
                     if (Values.isNotEmptyArray(selectedData)) {
@@ -404,8 +422,7 @@ const buildActionButton = function(props, subActionButton, innerLine) {
                     checkedNames.push(checkData[checkField]);
                 }
             }
-
-            modalOptions.content.replace('[options]', checkedNames.join(','));
+            modalOptions.content = modalOptions.content.replace('[options]', checkedNames.join(','));
 
             if (confirmType) {
                 if (confirmType === 'danger') {