@bit-sun/business-component 3.2.4-alpha.1 → 3.2.4-alpha.3

package/dist/components/Solution/RuleSetter/function.d.ts

@@ -1,7 +1,7 @@
 export declare const formatOperationList: (data: any) => any;
 export declare const formatRegularList: (data: any) => any;
 export declare const handleRuleShowBack: (data: any, functionRuleList: any, ruleReturnList: any) => any;
-export declare const handleRuleRequireCheck: (saveData: any, ruleActionData: any, ruleReturnConfig: any) => {
+export declare const handleRuleRequireCheck: (saveData: any, ruleActionData: any, ruleReturnConfig: any, isInstance?: boolean, regularDataList?: any) => {
     checkResult: boolean;
     checkInfo: any;
 };

package/dist/index.esm.js

@@ -1659,6 +1659,20 @@ var keyToWord = function keyToWord(data, fieldMapping) {
 };
 /**---------------------数据写入excel-------结束------------------------*/
 
+// 获取树平行结构
+var _coverToParallel = function coverToParallel(treeData, result, chilKey) {
+  var childrenKey = chilKey || 'children';
+  treeData.forEach(function (el) {
+    var _el$childrenKey;
+    result.push(el);
+    if ((el === null || el === void 0 ? void 0 : el[childrenKey]) && (el === null || el === void 0 ? void 0 : (_el$childrenKey = el[childrenKey]) === null || _el$childrenKey === void 0 ? void 0 : _el$childrenKey.length) > 0) {
+      // 子级递归
+      _coverToParallel(el === null || el === void 0 ? void 0 : el[childrenKey], result, chilKey);
+    }
+  });
+  return result;
+};
+
 var FORMAT_TIME_STR = 'YYYY-MM-DD HH:mm:ss';
 var FORMAT_DAY_STR = 'YYYY-MM-DD';
 var FUNCTION_GET = 'GET';
@@ -34651,17 +34665,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 树结构 转化成 平行树 (递归函数)
-    _this.coverToParallel = function (treeData, result) {
-      treeData.forEach(function (el) {
-        result.push(el);
-        if (el.children && el.children.length > 0) {
-          // 子级递归
-          _this.coverToParallel(el.children, result);
-        }
-      });
-      return result;
-    };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
       var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$;
       var ruleTreeData = _this.state.ruleTreeData;
@@ -34688,7 +34691,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         queryIdentify = _this.dynamicDictCodeToRangeIdMap["".concat(itemDetail.metaObjectCode, ".").concat(itemDetail.propertyPath)];
         queryIdentifyType = 'dynamicDictCodeIdentify';
       }
-      var parallelTreeData = _this.coverToParallel(ruleTreeData, []) || [];
+      var parallelTreeData = _coverToParallel(ruleTreeData, []) || [];
       var currentTreeItem = (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId) && parallelTreeData.find(function (i) {
         var _i$key;
         return ((i === null || i === void 0 ? void 0 : (_i$key = i.key) === null || _i$key === void 0 ? void 0 : _i$key.indexOf('.')) > -1 ? i.id : i.key) === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
@@ -35468,56 +35471,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
 var css_248z$u = ".goBack_btn_content {\n  position: relative;\n  overflow: auto;\n}\n.goBack_btn_content .goback_btn {\n  float: right;\n}\n.base_rule p {\n  margin: 0;\n}\n.base_rule .base_rule_content {\n  margin-bottom: 20px;\n}\n.base_rule .base_rule_line_title {\n  position: relative;\n  margin-bottom: 20px;\n}\n.base_rule .base_rule_line_title .rule_title {\n  height: 35px;\n  padding: 0 10px;\n  font-weight: bold;\n  font-size: 16px;\n  line-height: 35px;\n}\n.base_rule .base_rule_line_title .base_rule_btn_style {\n  position: absolute;\n  right: 0px;\n}\n.base_rule .base_rule_line_content {\n  display: flex;\n  padding: 14px 10px 10px;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn {\n  margin-right: 10px;\n  color: #89b9cf;\n  font-size: 20px;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn:hover {\n  cursor: pointer;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc_content {\n  height: 45px;\n  line-height: 45px;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc {\n  margin-right: 15px;\n}\n.base_rule .base_rule_line_content .base_rule_item1 {\n  align-items: center;\n  width: 120px;\n  color: #f8ab3c;\n  font-size: 16px;\n}\n.base_rule .base_rule_line_content .base_rule_item2 {\n  width: 1200px;\n}\n.base_rule .base_rule_line_content .base_rule_item3 {\n  display: flex;\n  align-items: center;\n  justify-content: space-around;\n  width: calc(100% - 600px);\n}\n.base_rule .base_rule_line_content .line_color_red {\n  color: #ed869b;\n}\n.base_rule .base_rule_line_content .base_rule_item4 {\n  width: 80px;\n}\n.base_rule .footer_line > span {\n  color: #008fe0;\n  font-weight: bold;\n  font-size: 16px;\n}\n.rule_name_title {\n  display: inline-block;\n  height: 30px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n  color: #f8ab3c;\n  font-size: 16px;\n  line-height: 30px;\n}\n.logical_operate_content {\n  position: relative;\n}\n.logical_operate_content .top_line {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content .bottom_line {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content::before {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 998;\n  width: 2px;\n  height: 100%;\n  overflow: hidden;\n  background: #d6efe8;\n  content: ' ';\n}\n.logical_item_btn {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  z-index: 999;\n  display: flex;\n  align-items: center;\n  width: 50px;\n  height: 30px;\n  margin-top: -15px;\n  margin-left: -25px;\n  padding: 0px;\n  color: #008fe0;\n  line-height: 30px;\n  text-align: center;\n  background-color: #ffffff;\n  cursor: pointer;\n}\n.logical_item_btn1 {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  display: inline-block;\n  width: 30px;\n  height: 30px;\n  margin-left: -15px;\n  color: #008fe0;\n  line-height: 30px;\n  text-align: center;\n  background-color: #ffffff;\n  cursor: pointer;\n}\n.rule_field_style {\n  display: inline-block;\n}\n.icon_btn_style {\n  margin-right: 10px;\n  font-size: 20px;\n}\n.choose_logical_type {\n  height: 25px;\n  margin: 0px;\n  padding: 0 10px;\n  line-height: 25px;\n  cursor: pointer;\n}\n.choose_logical_type:first-child {\n  border-bottom: 1px solid #d9d9d9;\n}\n.choose_logical_type:hover {\n  color: white;\n  background-color: #008fe0;\n}\n";
 styleInject(css_248z$u);
 
-// expression规则集合
-//{
-// complex,
-// dataTypeCode,
-// elementId,
-// elementName,
-// metaObjectCode,
-// operationCode,
-// operationType,
-// paramNames: [],
-// params: [],
-// propertyPath,
-// subExpression: [
-//   complex,
-//   dataTypeCode,
-//   elementId,
-//   elementName,
-//   metaObjectCode,
-//   operationCode,
-//   operationType,
-//   paramNames: [],
-//   params: [],
-//   propertyPath,
-//   subExpression: [.....] // 继续嵌套
-// ]
-// }
-// result 执行返回值/执行动作
-//{
-//     "return": {
-//         "enable": true,
-//         "value": "ticketId"
-//     },
-//     "execute": [
-//         {
-//             "priority": 1,
-//             "code": "functionCode",
-//             "properties": {
-//                 "${logisticsNum}": "dasdadasdadas"
-//             }
-//         },
-//         {
-//             "priority": 2,
-//             "code": "",
-//             "properties": {
-//                 "${detailList.skuCode}": "ccxcx",
-//                 "${logisticsNum}": "cxcxcx"
-//             }
-//         }
-//     ]
-// }
 var formatOperationList = function formatOperationList(data) {
   var _result$find;
   var result = data || [];
@@ -35659,9 +35612,39 @@ var isNoEmpty = function isNoEmpty(data) {
   return Array.isArray(data) && data.length > 0 || !(data == null || data == undefined || String(data).trim() == '');
 };
 // 校验必填数据
-var handleRuleRequireCheck = function handleRuleRequireCheck(saveData, ruleActionData, ruleReturnConfig) {
+var handleRuleRequireCheck = function handleRuleRequireCheck(saveData, ruleActionData, ruleReturnConfig, isInstance, regularDataList) {
   var checkResult = false; // 默认通过校验
   var checkInfo = []; // 没有选必填执行动作(暂不考虑)；执行动作下的对象未选
+  // 处理对象-设置了必填-规则实例保存时数据必填校验
+  if (isInstance && (regularDataList === null || regularDataList === void 0 ? void 0 : regularDataList.length) && (saveData === null || saveData === void 0 ? void 0 : saveData.length)) {
+    var list = _coverToParallel(regularDataList, [], 'propertyList'); // 平铺对象树
+    var requiredList = list.filter(function (c) {
+      return c.required == 1;
+    }) || []; // 获取对象属性为true的集合
+    (requiredList === null || requiredList === void 0 ? void 0 : requiredList.length) && saveData.forEach(function (s, index) {
+      var _s$expression, _s$expression$subExpr, _s$expression2, _coverExpressionTree$;
+      var coverExpressionTree = (s === null || s === void 0 ? void 0 : (_s$expression = s.expression) === null || _s$expression === void 0 ? void 0 : (_s$expression$subExpr = _s$expression.subExpression) === null || _s$expression$subExpr === void 0 ? void 0 : _s$expression$subExpr.length) ? _coverToParallel(s === null || s === void 0 ? void 0 : (_s$expression2 = s.expression) === null || _s$expression2 === void 0 ? void 0 : _s$expression2.subExpression, [], 'subExpression') : (s === null || s === void 0 ? void 0 : s.expression) && [s === null || s === void 0 ? void 0 : s.expression];
+      (coverExpressionTree === null || coverExpressionTree === void 0 ? void 0 : coverExpressionTree.length) && (coverExpressionTree === null || coverExpressionTree === void 0 ? void 0 : (_coverExpressionTree$ = coverExpressionTree.forEach) === null || _coverExpressionTree$ === void 0 ? void 0 : _coverExpressionTree$.call(coverExpressionTree, function (e) {
+        if (requiredList.some(function (r) {
+          return r.id === e.elementId;
+        })) {
+          var _e$params, _e$params2;
+          var isComplete = !!(e === null || e === void 0 ? void 0 : (_e$params = e.params) === null || _e$params === void 0 ? void 0 : _e$params.length) && isNoEmpty(e === null || e === void 0 ? void 0 : (_e$params2 = e.params) === null || _e$params2 === void 0 ? void 0 : _e$params2[0]);
+          if (!isComplete) {
+            checkResult = true;
+            // 如果 e.elementName 不存在于 checkInfo 中，则添加
+            if (Array.isArray(checkInfo) && e && typeof e.elementName === 'string') {
+              var checkText = "\u89C4\u5219".concat(index + 1, ": \u5B58\u5728\u5BF9\u8C61\u3010").concat(e.elementName, "\u3011\u4FE1\u606F\u586B\u5199\u4E0D\u5B8C\u6574");
+              var checkInfoSet = new Set(checkInfo);
+              if (!checkInfoSet.has(checkText)) {
+                checkInfo.push(checkText);
+              }
+            }
+          }
+        }
+      }));
+    });
+  }
   // 校验返回值必填数据(兼容新/老数据: 配置对象为新数据/旧数据、规则返回值配置为老/新数据。组合一共是四种情况)
   if (((ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : ruleReturnConfig.required) || Array.isArray(ruleReturnConfig) && (ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : ruleReturnConfig.length)) && saveData.length) {
     var checkKey = 'code';
@@ -36113,7 +36096,7 @@ var BaseRule = /*#__PURE__*/forwardRef(function (props, ref) {
       message$1.warning('请至少配置一个规则！');
       return Promise.reject();
     }
-    var actionRequiredCheckObject = handleRuleRequireCheck(ruleResultList, ruleTypeData, ruleReturnConfig);
+    var actionRequiredCheckObject = handleRuleRequireCheck(ruleResultList, ruleTypeData, ruleReturnConfig, type == 'instance', regularDataList);
     if (actionRequiredCheckObject === null || actionRequiredCheckObject === void 0 ? void 0 : actionRequiredCheckObject.checkResult) {
       var modal = Modal.warning({
         title: '保存校验提示',
@@ -36124,7 +36107,7 @@ var BaseRule = /*#__PURE__*/forwardRef(function (props, ref) {
       setTimeout(function () {
         modal.destroy();
       }, 10000);
-      return;
+      return Promise.reject();
     }
     // setLoading(true);
     // 兼容没有规则组的情况
@@ -36447,4 +36430,4 @@ var index$7 = /*#__PURE__*/forwardRef(function (props, ref) {
   })));
 });
 
-export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, AuthButton, BillEntry, BsCascader, index$5 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$1 as CheckOneUser, ColumnSettingTable, ColumnsEdit, CommodityEntry, CustomSelector, DataImport, DataValidation, index$3 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, HandleTotalCount, index$4 as HomePageWrapper, JsonQueryTable, index$6 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$7 as RuleSetter, SearchSelect, index$2 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, calculateValidPeriod, checkQuantityAccuracy, createUniqID, downloadExcel, ergodicMenuRoutes, _formatter as formatter, getAccountID, getAccountId, getBreadcrumbNameMap, getCommonInfoKey, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getDictionaryTextByValue, getEmployeeCode, getEmployeeId, getItemDefaultWidth$1 as getItemDefaultWidth, getJoinDictionaryText, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getSkuImg, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBaseUrlPre, handleBeforeUpload, handleBssulaColumnsSpecialParams, handleCommonTimeRender$1 as handleCommonTimeRender, handleConvertResponse, handleError, handleExport, handleExportBarCode, handleJudgeAuthButtons, handleOssUrl, handleRequestAuthHeader, handleRequestHeader, handleRequestUrl, handleStatusBadge, handleTextBreakSpaces, handleTextDouble$1 as handleTextDouble, handleTextDoubleOrId, handleTextLineFeed$1 as handleTextLineFeed, handleTextOverflow$1 as handleTextOverflow, handleTextTooltip, handleTextWarp, handleTextWarpCustom, handleTooltip$1 as handleTooltip, handleTooltipHours$1 as handleTooltipHours, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, keyToWord, memoizeOneFormatter, noEmptyArr, noEmptyArray, paramsControl, parseWidth, precisionQuantity, randomString, readerXlsxToList, removeCurrentTenantId, removeTenantList, renderFixed2, renderNumberText, saveCurrentTenantId, saveTenantList, setConfigTableColumns, shouldUseAuth, socketFunctions, sulaTableRenderTooltip, tableColumnsImage$1 as tableColumnsImage, textIcon, updateGuanDate, userColumns$1 as userColumns, userInfoCard$1 as userInfoCard, uuid, writeListToXlsx };
+export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, AuthButton, BillEntry, BsCascader, index$5 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$1 as CheckOneUser, ColumnSettingTable, ColumnsEdit, CommodityEntry, CustomSelector, DataImport, DataValidation, index$3 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, HandleTotalCount, index$4 as HomePageWrapper, JsonQueryTable, index$6 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$7 as RuleSetter, SearchSelect, index$2 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, calculateValidPeriod, checkQuantityAccuracy, _coverToParallel as coverToParallel, createUniqID, downloadExcel, ergodicMenuRoutes, _formatter as formatter, getAccountID, getAccountId, getBreadcrumbNameMap, getCommonInfoKey, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getDictionaryTextByValue, getEmployeeCode, getEmployeeId, getItemDefaultWidth$1 as getItemDefaultWidth, getJoinDictionaryText, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getSkuImg, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBaseUrlPre, handleBeforeUpload, handleBssulaColumnsSpecialParams, handleCommonTimeRender$1 as handleCommonTimeRender, handleConvertResponse, handleError, handleExport, handleExportBarCode, handleJudgeAuthButtons, handleOssUrl, handleRequestAuthHeader, handleRequestHeader, handleRequestUrl, handleStatusBadge, handleTextBreakSpaces, handleTextDouble$1 as handleTextDouble, handleTextDoubleOrId, handleTextLineFeed$1 as handleTextLineFeed, handleTextOverflow$1 as handleTextOverflow, handleTextTooltip, handleTextWarp, handleTextWarpCustom, handleTooltip$1 as handleTooltip, handleTooltipHours$1 as handleTooltipHours, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, keyToWord, memoizeOneFormatter, noEmptyArr, noEmptyArray, paramsControl, parseWidth, precisionQuantity, randomString, readerXlsxToList, removeCurrentTenantId, removeTenantList, renderFixed2, renderNumberText, saveCurrentTenantId, saveTenantList, setConfigTableColumns, shouldUseAuth, socketFunctions, sulaTableRenderTooltip, tableColumnsImage$1 as tableColumnsImage, textIcon, updateGuanDate, userColumns$1 as userColumns, userInfoCard$1 as userInfoCard, uuid, writeListToXlsx };

package/dist/index.js

@@ -1682,6 +1682,20 @@ var keyToWord = function keyToWord(data, fieldMapping) {
 };
 /**---------------------数据写入excel-------结束------------------------*/
 
+// 获取树平行结构
+var _coverToParallel = function coverToParallel(treeData, result, chilKey) {
+  var childrenKey = chilKey || 'children';
+  treeData.forEach(function (el) {
+    var _el$childrenKey;
+    result.push(el);
+    if ((el === null || el === void 0 ? void 0 : el[childrenKey]) && (el === null || el === void 0 ? void 0 : (_el$childrenKey = el[childrenKey]) === null || _el$childrenKey === void 0 ? void 0 : _el$childrenKey.length) > 0) {
+      // 子级递归
+      _coverToParallel(el === null || el === void 0 ? void 0 : el[childrenKey], result, chilKey);
+    }
+  });
+  return result;
+};
+
 var FORMAT_TIME_STR = 'YYYY-MM-DD HH:mm:ss';
 var FORMAT_DAY_STR = 'YYYY-MM-DD';
 var FUNCTION_GET = 'GET';
@@ -34674,17 +34688,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
-    // 树结构 转化成 平行树 (递归函数)
-    _this.coverToParallel = function (treeData, result) {
-      treeData.forEach(function (el) {
-        result.push(el);
-        if (el.children && el.children.length > 0) {
-          // 子级递归
-          _this.coverToParallel(el.children, result);
-        }
-      });
-      return result;
-    };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
       var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$;
       var ruleTreeData = _this.state.ruleTreeData;
@@ -34711,7 +34714,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         queryIdentify = _this.dynamicDictCodeToRangeIdMap["".concat(itemDetail.metaObjectCode, ".").concat(itemDetail.propertyPath)];
         queryIdentifyType = 'dynamicDictCodeIdentify';
       }
-      var parallelTreeData = _this.coverToParallel(ruleTreeData, []) || [];
+      var parallelTreeData = _coverToParallel(ruleTreeData, []) || [];
       var currentTreeItem = (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId) && parallelTreeData.find(function (i) {
         var _i$key;
         return ((i === null || i === void 0 ? void 0 : (_i$key = i.key) === null || _i$key === void 0 ? void 0 : _i$key.indexOf('.')) > -1 ? i.id : i.key) === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
@@ -35491,56 +35494,6 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
 var css_248z$u = ".goBack_btn_content {\n  position: relative;\n  overflow: auto;\n}\n.goBack_btn_content .goback_btn {\n  float: right;\n}\n.base_rule p {\n  margin: 0;\n}\n.base_rule .base_rule_content {\n  margin-bottom: 20px;\n}\n.base_rule .base_rule_line_title {\n  position: relative;\n  margin-bottom: 20px;\n}\n.base_rule .base_rule_line_title .rule_title {\n  height: 35px;\n  padding: 0 10px;\n  font-weight: bold;\n  font-size: 16px;\n  line-height: 35px;\n}\n.base_rule .base_rule_line_title .base_rule_btn_style {\n  position: absolute;\n  right: 0px;\n}\n.base_rule .base_rule_line_content {\n  display: flex;\n  padding: 14px 10px 10px;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn {\n  margin-right: 10px;\n  color: #89b9cf;\n  font-size: 20px;\n}\n.base_rule .base_rule_line_content .base_rule_icon_btn:hover {\n  cursor: pointer;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc_content {\n  height: 45px;\n  line-height: 45px;\n}\n.base_rule .base_rule_line_content .base_rule_item_desc {\n  margin-right: 15px;\n}\n.base_rule .base_rule_line_content .base_rule_item1 {\n  align-items: center;\n  width: 120px;\n  color: #f8ab3c;\n  font-size: 16px;\n}\n.base_rule .base_rule_line_content .base_rule_item2 {\n  width: 1200px;\n}\n.base_rule .base_rule_line_content .base_rule_item3 {\n  display: flex;\n  align-items: center;\n  justify-content: space-around;\n  width: calc(100% - 600px);\n}\n.base_rule .base_rule_line_content .line_color_red {\n  color: #ed869b;\n}\n.base_rule .base_rule_line_content .base_rule_item4 {\n  width: 80px;\n}\n.base_rule .footer_line > span {\n  color: #008fe0;\n  font-weight: bold;\n  font-size: 16px;\n}\n.rule_name_title {\n  display: inline-block;\n  height: 30px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n  color: #f8ab3c;\n  font-size: 16px;\n  line-height: 30px;\n}\n.logical_operate_content {\n  position: relative;\n}\n.logical_operate_content .top_line {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content .bottom_line {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  width: 15px;\n  height: 2px;\n  background-color: #d6efe8;\n}\n.logical_operate_content::before {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  z-index: 998;\n  width: 2px;\n  height: 100%;\n  overflow: hidden;\n  background: #d6efe8;\n  content: ' ';\n}\n.logical_item_btn {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  z-index: 999;\n  display: flex;\n  align-items: center;\n  width: 50px;\n  height: 30px;\n  margin-top: -15px;\n  margin-left: -25px;\n  padding: 0px;\n  color: #008fe0;\n  line-height: 30px;\n  text-align: center;\n  background-color: #ffffff;\n  cursor: pointer;\n}\n.logical_item_btn1 {\n  position: absolute;\n  bottom: 0;\n  left: 50%;\n  z-index: 999;\n  display: inline-block;\n  width: 30px;\n  height: 30px;\n  margin-left: -15px;\n  color: #008fe0;\n  line-height: 30px;\n  text-align: center;\n  background-color: #ffffff;\n  cursor: pointer;\n}\n.rule_field_style {\n  display: inline-block;\n}\n.icon_btn_style {\n  margin-right: 10px;\n  font-size: 20px;\n}\n.choose_logical_type {\n  height: 25px;\n  margin: 0px;\n  padding: 0 10px;\n  line-height: 25px;\n  cursor: pointer;\n}\n.choose_logical_type:first-child {\n  border-bottom: 1px solid #d9d9d9;\n}\n.choose_logical_type:hover {\n  color: white;\n  background-color: #008fe0;\n}\n";
 styleInject(css_248z$u);
 
-// expression规则集合
-//{
-// complex,
-// dataTypeCode,
-// elementId,
-// elementName,
-// metaObjectCode,
-// operationCode,
-// operationType,
-// paramNames: [],
-// params: [],
-// propertyPath,
-// subExpression: [
-//   complex,
-//   dataTypeCode,
-//   elementId,
-//   elementName,
-//   metaObjectCode,
-//   operationCode,
-//   operationType,
-//   paramNames: [],
-//   params: [],
-//   propertyPath,
-//   subExpression: [.....] // 继续嵌套
-// ]
-// }
-// result 执行返回值/执行动作
-//{
-//     "return": {
-//         "enable": true,
-//         "value": "ticketId"
-//     },
-//     "execute": [
-//         {
-//             "priority": 1,
-//             "code": "functionCode",
-//             "properties": {
-//                 "${logisticsNum}": "dasdadasdadas"
-//             }
-//         },
-//         {
-//             "priority": 2,
-//             "code": "",
-//             "properties": {
-//                 "${detailList.skuCode}": "ccxcx",
-//                 "${logisticsNum}": "cxcxcx"
-//             }
-//         }
-//     ]
-// }
 var formatOperationList = function formatOperationList(data) {
   var _result$find;
   var result = data || [];
@@ -35682,9 +35635,39 @@ var isNoEmpty = function isNoEmpty(data) {
   return Array.isArray(data) && data.length > 0 || !(data == null || data == undefined || String(data).trim() == '');
 };
 // 校验必填数据
-var handleRuleRequireCheck = function handleRuleRequireCheck(saveData, ruleActionData, ruleReturnConfig) {
+var handleRuleRequireCheck = function handleRuleRequireCheck(saveData, ruleActionData, ruleReturnConfig, isInstance, regularDataList) {
   var checkResult = false; // 默认通过校验
   var checkInfo = []; // 没有选必填执行动作(暂不考虑)；执行动作下的对象未选
+  // 处理对象-设置了必填-规则实例保存时数据必填校验
+  if (isInstance && (regularDataList === null || regularDataList === void 0 ? void 0 : regularDataList.length) && (saveData === null || saveData === void 0 ? void 0 : saveData.length)) {
+    var list = _coverToParallel(regularDataList, [], 'propertyList'); // 平铺对象树
+    var requiredList = list.filter(function (c) {
+      return c.required == 1;
+    }) || []; // 获取对象属性为true的集合
+    (requiredList === null || requiredList === void 0 ? void 0 : requiredList.length) && saveData.forEach(function (s, index) {
+      var _s$expression, _s$expression$subExpr, _s$expression2, _coverExpressionTree$;
+      var coverExpressionTree = (s === null || s === void 0 ? void 0 : (_s$expression = s.expression) === null || _s$expression === void 0 ? void 0 : (_s$expression$subExpr = _s$expression.subExpression) === null || _s$expression$subExpr === void 0 ? void 0 : _s$expression$subExpr.length) ? _coverToParallel(s === null || s === void 0 ? void 0 : (_s$expression2 = s.expression) === null || _s$expression2 === void 0 ? void 0 : _s$expression2.subExpression, [], 'subExpression') : (s === null || s === void 0 ? void 0 : s.expression) && [s === null || s === void 0 ? void 0 : s.expression];
+      (coverExpressionTree === null || coverExpressionTree === void 0 ? void 0 : coverExpressionTree.length) && (coverExpressionTree === null || coverExpressionTree === void 0 ? void 0 : (_coverExpressionTree$ = coverExpressionTree.forEach) === null || _coverExpressionTree$ === void 0 ? void 0 : _coverExpressionTree$.call(coverExpressionTree, function (e) {
+        if (requiredList.some(function (r) {
+          return r.id === e.elementId;
+        })) {
+          var _e$params, _e$params2;
+          var isComplete = !!(e === null || e === void 0 ? void 0 : (_e$params = e.params) === null || _e$params === void 0 ? void 0 : _e$params.length) && isNoEmpty(e === null || e === void 0 ? void 0 : (_e$params2 = e.params) === null || _e$params2 === void 0 ? void 0 : _e$params2[0]);
+          if (!isComplete) {
+            checkResult = true;
+            // 如果 e.elementName 不存在于 checkInfo 中，则添加
+            if (Array.isArray(checkInfo) && e && typeof e.elementName === 'string') {
+              var checkText = "\u89C4\u5219".concat(index + 1, ": \u5B58\u5728\u5BF9\u8C61\u3010").concat(e.elementName, "\u3011\u4FE1\u606F\u586B\u5199\u4E0D\u5B8C\u6574");
+              var checkInfoSet = new Set(checkInfo);
+              if (!checkInfoSet.has(checkText)) {
+                checkInfo.push(checkText);
+              }
+            }
+          }
+        }
+      }));
+    });
+  }
   // 校验返回值必填数据(兼容新/老数据: 配置对象为新数据/旧数据、规则返回值配置为老/新数据。组合一共是四种情况)
   if (((ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : ruleReturnConfig.required) || Array.isArray(ruleReturnConfig) && (ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : ruleReturnConfig.length)) && saveData.length) {
     var checkKey = 'code';
@@ -36136,7 +36119,7 @@ var BaseRule = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       antd.message.warning('请至少配置一个规则！');
       return Promise.reject();
     }
-    var actionRequiredCheckObject = handleRuleRequireCheck(ruleResultList, ruleTypeData, ruleReturnConfig);
+    var actionRequiredCheckObject = handleRuleRequireCheck(ruleResultList, ruleTypeData, ruleReturnConfig, type == 'instance', regularDataList);
     if (actionRequiredCheckObject === null || actionRequiredCheckObject === void 0 ? void 0 : actionRequiredCheckObject.checkResult) {
       var modal = antd.Modal.warning({
         title: '保存校验提示',
@@ -36147,7 +36130,7 @@ var BaseRule = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       setTimeout(function () {
         modal.destroy();
       }, 10000);
-      return;
+      return Promise.reject();
     }
     // setLoading(true);
     // 兼容没有规则组的情况
@@ -36507,6 +36490,7 @@ exports.TreeSearchSelect = TreeSearchSelect;
 exports.authFunc = authFunc;
 exports.calculateValidPeriod = calculateValidPeriod;
 exports.checkQuantityAccuracy = checkQuantityAccuracy;
+exports.coverToParallel = _coverToParallel;
 exports.createUniqID = createUniqID;
 exports.downloadExcel = downloadExcel;
 exports.ergodicMenuRoutes = ergodicMenuRoutes;

package/dist/utils/TreeUtils.d.ts

@@ -0,0 +1 @@
+export declare const coverToParallel: (treeData: any, result: any[], chilKey: string) => any[];

package/dist/utils/index.d.ts

@@ -4,6 +4,7 @@ import './LocalstorageUtils';
 import './utils';
 import './auth';
 import './xlsxUtil';
+import './TreeUtils';
 export * from './requestUtils';
 export * from './checkUtils';
 export * from './LocalstorageUtils';
@@ -14,3 +15,4 @@ export * from './TableUtils';
 export * from './businessUtils';
 export * from './utils';
 export * from './xlsxUtil';
+export * from './TreeUtils';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.2.4-alpha.1",
+  "version": "3.2.4-alpha.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Solution/RuleComponent/index.js

@@ -34,6 +34,7 @@ import {
   isObj,
 } from './util';
 import { getDictionarySource, uuid } from '../../../utils/utils';
+import { coverToParallel } from '../../../utils/TreeUtils';
 import {
   BusinessSearchSelect,
   BusinessTreeSearchSelect,
@@ -613,18 +614,6 @@ class RuleObjectComponent extends Component {
     );
   };
 
-  // 树结构 转化成 平行树 (递归函数)
-  coverToParallel = (treeData, result) => {
-    treeData.forEach((el) => {
-      result.push(el);
-      if (el.children && el.children.length > 0) {
-        // 子级递归
-        this.coverToParallel(el.children, result);
-      }
-    });
-    return result;
-  };
-
   renderRuleItem = (
     itemDetail,
     parentDetail,
@@ -687,7 +676,7 @@ class RuleObjectComponent extends Component {
       queryIdentifyType = 'dynamicDictCodeIdentify';
     }
 
-    const parallelTreeData = this.coverToParallel(ruleTreeData, []) || [];
+    const parallelTreeData = coverToParallel(ruleTreeData, []) || [];
     const currentTreeItem =
       itemDetail?.elementId &&
       parallelTreeData.find((i) => (i?.key?.indexOf('.') > -1 ? i.id : i.key) === itemDetail?.elementId);

package/src/components/Solution/RuleSetter/baseRule.tsx

@@ -265,7 +265,9 @@ export default forwardRef((props: any, ref) => {
     const actionRequiredCheckObject = handleRuleRequireCheck(
       ruleResultList,
       ruleTypeData,
-      ruleReturnConfig
+      ruleReturnConfig,
+      type == 'instance',
+      regularDataList
     );
     if (actionRequiredCheckObject?.checkResult) {
       const modal = Modal.warning({
@@ -277,7 +279,7 @@ export default forwardRef((props: any, ref) => {
       setTimeout(() => {
         modal.destroy();
       }, 10000);
-      return;
+      return Promise.reject();
     }
 
     // setLoading(true);

package/src/components/Solution/RuleSetter/function.ts

@@ -48,6 +48,7 @@
 //         }
 //     ]
 // }
+import { coverToParallel } from '@/utils/TreeUtils';
 export const formatOperationList = (data: any) => {
   let result = data||[];
   result = result.concat([{
@@ -194,12 +195,39 @@ const isNoEmpty = (data: any) =>
   !(data == null || data == undefined || String(data).trim() == '');
 
 // 校验必填数据
-export const handleRuleRequireCheck = (saveData: any, ruleActionData: any, ruleReturnConfig: any) => {
+export const handleRuleRequireCheck = (saveData: any, ruleActionData: any, ruleReturnConfig: any, isInstance?: boolean, regularDataList?: any) => {
   let checkResult = false; // 默认通过校验
-  let checkInfo: any = []; // 没有选必填执行动作(暂不考虑)；执行动作下的对象未选
+  const checkInfo: any = []; // 没有选必填执行动作(暂不考虑)；执行动作下的对象未选
+
+  // 处理对象-设置了必填-规则实例保存时数据必填校验
+  if (isInstance && regularDataList?.length && saveData?.length) {
+    const list = coverToParallel(regularDataList,[],'propertyList'); // 平铺对象树
+    const requiredList = list.filter((c: any) => c.required == 1)||[]; // 获取对象属性为true的集合
+    requiredList?.length &&
+    saveData.forEach((s: any, index: number) => {
+      const coverExpressionTree = s?.expression?.subExpression?.length ? coverToParallel(s?.expression?.subExpression,[],'subExpression') : (s?.expression && [s?.expression]);
+      coverExpressionTree?.length &&
+      coverExpressionTree?.forEach?.((e: any) => {
+          if (requiredList.some((r: any) => r.id === e.elementId)) {
+            const isComplete = !!e?.params?.length && isNoEmpty(e?.params?.[0]);
+            if (!isComplete) {
+              checkResult = true;
+              // 如果 e.elementName 不存在于 checkInfo 中，则添加
+              if (Array.isArray(checkInfo) && e && typeof e.elementName === 'string') {
+                const checkText = `规则${index + 1}: 存在对象【${e.elementName}】信息填写不完整`
+                const checkInfoSet = new Set(checkInfo);
+                if (!checkInfoSet.has(checkText)) {
+                  checkInfo.push(checkText);
+                }
+              }
+            }
+          }
+        });
+    });
+  }
 
   // 校验返回值必填数据(兼容新/老数据: 配置对象为新数据/旧数据、规则返回值配置为老/新数据。组合一共是四种情况)
-  if((ruleReturnConfig?.required || (Array.isArray(ruleReturnConfig) && ruleReturnConfig?.length)) && saveData.length) {
+  if ((ruleReturnConfig?.required || (Array.isArray(ruleReturnConfig) && ruleReturnConfig?.length)) && saveData.length) {
     const checkKey = 'code'
 
     saveData.forEach((s: any, index: number) => {

package/src/utils/TreeUtils.ts

@@ -0,0 +1,12 @@
+// 获取树平行结构
+export const coverToParallel = (treeData: any, result: any[],chilKey: string) =>{
+  let childrenKey = chilKey || 'children';
+  treeData.forEach((el: any)=>{
+    result.push(el);
+    if(el?.[childrenKey] && el?.[childrenKey]?.length>0) {
+      // 子级递归
+      coverToParallel(el?.[childrenKey],result,chilKey)
+    }
+  });
+  return result
+};

package/src/utils/index.ts

@@ -4,6 +4,7 @@ import './LocalstorageUtils';
 import './utils';
 import './auth'
 import './xlsxUtil';
+import './TreeUtils';
 
 // 导出所有工具函数
 export * from './requestUtils';
@@ -16,4 +17,5 @@ export * from './TableUtils';
 export * from './businessUtils';
 export * from './utils';
 export * from './xlsxUtil';
+export * from './TreeUtils';