@bit-sun/business-component 4.2.1-alpha.20-aiwei → 4.2.1-alpha.22-aiwei

package/dist/index.esm.js

@@ -38840,7 +38840,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
-      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2;
+      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2, _itemDetail$reqCondit, _itemDetail$reqCondit2, _itemDetail$reqCondit3, _itemDetail$reqCondit4;
       var ruleTreeData = _this.state.ruleTreeData;
       var _this$props3 = _this.props,
         callBack = _this$props3.callBack,
@@ -39111,12 +39111,13 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '取消插入SQL' : '插入SQL')), /*#__PURE__*/React$1.createElement("div", {
         style: {
-          display: itemDetail.operationType == 'logic' && !disabled ? 'block' : 'none'
+          display: itemDetail.operationType == 'logic' && (!disabled || itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit === void 0 ? void 0 : _itemDetail$reqCondit.length)) ? 'block' : 'none'
         }
       }, /*#__PURE__*/React$1.createElement("span", {
         style: {
           color: '#008fe0',
-          cursor: 'pointer'
+          cursor: 'pointer',
+          display: disabled ? 'none' : 'inline'
         },
         type: "link",
         onClick: function onClick() {
@@ -39130,10 +39131,12 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }), "\u6DFB\u52A0\u6761\u4EF6"), needShowReqCondition && /*#__PURE__*/React$1.createElement("span", {
         style: {
-          marginLeft: 10
+          marginLeft: 10,
+          display: disabled ? 'none' : 'inline'
         }
       }, /*#__PURE__*/React$1.createElement(Button, {
         type: "link",
+        disabled: disabled && (!itemDetail.reqConditionData || !itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit2 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit2 === void 0 ? void 0 : _itemDetail$reqCondit2.length)),
         style: {
           padding: 0,
           height: 'auto'
@@ -39141,10 +39144,10 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           return _this.handleReqConditionToggle(itemDetail);
         }
-      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), itemDetail.isReqCondition && itemDetail.reqConditionData && /*#__PURE__*/React$1.createElement("div", {
+      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), (itemDetail.isReqCondition || disabled && itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit3 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit3 === void 0 ? void 0 : _itemDetail$reqCondit3.length)) && itemDetail.reqConditionData && /*#__PURE__*/React$1.createElement("div", {
         style: {
           marginTop: 10,
-          display: 'flex',
+          display: disabled && (!itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit4 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit4 === void 0 ? void 0 : _itemDetail$reqCondit4.length)) ? 'none' : 'flex',
           alignItems: 'center',
           background: '#f5f5f5',
           padding: '10px',
@@ -39156,6 +39159,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           flexShrink: 0
         }
       }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0:"), /*#__PURE__*/React$1.createElement(Input, {
+        disabled: disabled,
         style: {
           width: 150,
           marginRight: 10
@@ -39170,6 +39174,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           flexShrink: 0
         }
       }, "\u7C7B\u578B:"), /*#__PURE__*/React$1.createElement(Select, {
+        disabled: disabled,
         style: {
           width: 120,
           marginRight: 10
@@ -39184,6 +39189,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: code
         }, FIXED_DATA_TYPES[code]);
       })), /*#__PURE__*/React$1.createElement(Select, {
+        disabled: disabled,
         style: {
           width: 120,
           marginRight: 10
@@ -39193,17 +39199,20 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           return _this.handleReqDataChange(itemDetail, 'operationCode', val);
         }
       }, [{
-        'code': 'eq',
-        'name': '等于'
+        'code': '1',
+        'name': '在集合'
       }, {
-        'code': 'cn',
-        'name': '包含'
+        'code': '2',
+        'name': '不等于'
       }, {
-        code: 'gt',
+        code: '3',
+        name: '小于'
+      }, {
+        code: '4',
         name: '大于'
       }, {
-        code: 'lt',
-        name: '小于'
+        code: '5',
+        name: '等于'
       }].map(function (op) {
         return /*#__PURE__*/React$1.createElement(Select.Option, {
           key: op.code,
@@ -39670,9 +39679,9 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
         itemDetail.reqConditionData = {
           operationType: 'relation',
-          dataTypeCode: '21',
-          entityInputType: '21',
-          entityValueType: '21',
+          dataTypeCode: '10',
+          entityInputType: '10',
+          entityValueType: '10',
           operationCode: '',
           reqParamName: '',
           params: [],

package/dist/index.js

@@ -38863,7 +38863,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
-      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2;
+      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2, _itemDetail$reqCondit, _itemDetail$reqCondit2, _itemDetail$reqCondit3, _itemDetail$reqCondit4;
       var ruleTreeData = _this.state.ruleTreeData;
       var _this$props3 = _this.props,
         callBack = _this$props3.callBack,
@@ -39134,12 +39134,13 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '取消插入SQL' : '插入SQL')), /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
-          display: itemDetail.operationType == 'logic' && !disabled ? 'block' : 'none'
+          display: itemDetail.operationType == 'logic' && (!disabled || itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit === void 0 ? void 0 : _itemDetail$reqCondit.length)) ? 'block' : 'none'
         }
       }, /*#__PURE__*/React__default['default'].createElement("span", {
         style: {
           color: '#008fe0',
-          cursor: 'pointer'
+          cursor: 'pointer',
+          display: disabled ? 'none' : 'inline'
         },
         type: "link",
         onClick: function onClick() {
@@ -39153,10 +39154,12 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }), "\u6DFB\u52A0\u6761\u4EF6"), needShowReqCondition && /*#__PURE__*/React__default['default'].createElement("span", {
         style: {
-          marginLeft: 10
+          marginLeft: 10,
+          display: disabled ? 'none' : 'inline'
         }
       }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
         type: "link",
+        disabled: disabled && (!itemDetail.reqConditionData || !itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit2 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit2 === void 0 ? void 0 : _itemDetail$reqCondit2.length)),
         style: {
           padding: 0,
           height: 'auto'
@@ -39164,10 +39167,10 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           return _this.handleReqConditionToggle(itemDetail);
         }
-      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), itemDetail.isReqCondition && itemDetail.reqConditionData && /*#__PURE__*/React__default['default'].createElement("div", {
+      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), (itemDetail.isReqCondition || disabled && itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit3 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit3 === void 0 ? void 0 : _itemDetail$reqCondit3.length)) && itemDetail.reqConditionData && /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
           marginTop: 10,
-          display: 'flex',
+          display: disabled && (!itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit4 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit4 === void 0 ? void 0 : _itemDetail$reqCondit4.length)) ? 'none' : 'flex',
           alignItems: 'center',
           background: '#f5f5f5',
           padding: '10px',
@@ -39179,6 +39182,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           flexShrink: 0
         }
       }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0:"), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+        disabled: disabled,
         style: {
           width: 150,
           marginRight: 10
@@ -39193,6 +39197,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           flexShrink: 0
         }
       }, "\u7C7B\u578B:"), /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        disabled: disabled,
         style: {
           width: 120,
           marginRight: 10
@@ -39207,6 +39212,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: code
         }, FIXED_DATA_TYPES[code]);
       })), /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        disabled: disabled,
         style: {
           width: 120,
           marginRight: 10
@@ -39216,17 +39222,20 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           return _this.handleReqDataChange(itemDetail, 'operationCode', val);
         }
       }, [{
-        'code': 'eq',
-        'name': '等于'
+        'code': '1',
+        'name': '在集合'
       }, {
-        'code': 'cn',
-        'name': '包含'
+        'code': '2',
+        'name': '不等于'
       }, {
-        code: 'gt',
+        code: '3',
+        name: '小于'
+      }, {
+        code: '4',
         name: '大于'
       }, {
-        code: 'lt',
-        name: '小于'
+        code: '5',
+        name: '等于'
       }].map(function (op) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
           key: op.code,
@@ -39693,9 +39702,9 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
         itemDetail.reqConditionData = {
           operationType: 'relation',
-          dataTypeCode: '21',
-          entityInputType: '21',
-          entityValueType: '21',
+          dataTypeCode: '10',
+          entityInputType: '10',
+          entityValueType: '10',
           operationCode: '',
           reqParamName: '',
           params: [],

package/package.json

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

package/src/components/Solution/RuleComponent/README.md

@@ -78,6 +78,7 @@ import { RuleComponent } from '../../../index';
 
 export default () => {
   const [ruleClassData, setRuleClassData] = useState([]);
+  const [disabled, setDisabled] = useState(false);
 
   // 模拟规则对象数据源
   const regularDataList = [
@@ -135,6 +136,20 @@ export default () => {
   return (
     <div style={{ background: '#f0f2f5', padding: 20, width: '1200px' }}>
       <div style={{ marginBottom: 16, textAlign: 'right' }}>
+        <button
+          onClick={() => setDisabled(!disabled)}
+          style={{
+            backgroundColor: '#faad14',
+            color: '#fff',
+            border: 'none',
+            padding: '6px 15px',
+            borderRadius: '2px',
+            cursor: 'pointer',
+            marginRight: '10px'
+          }}
+        >
+          {disabled ? '启用编辑' : '禁用编辑'}
+        </button>
         <button
           onClick={handleSave}
           style={{
@@ -156,6 +171,7 @@ export default () => {
         needShowInsertSQL={true}
         needShowReqCondition={true}
         systemVariableList={systemVariableList}
+        disabled={disabled}
         callBack={(newData) => {
           console.log('Rule Changed:', newData);
           setRuleClassData([...newData]);

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

@@ -1069,13 +1069,21 @@ class RuleObjectComponent extends Component {
           <div
             style={{
               display:
-                itemDetail.operationType == 'logic' && !disabled
+                itemDetail.operationType == 'logic' &&
+                (!disabled ||
+                  (itemDetail.reqConditionData &&
+                    itemDetail.reqConditionData.reqParamName &&
+                    itemDetail.reqConditionData.params?.length))
                   ? 'block'
                   : 'none',
             }}
           >
             <span
-              style={{ color: '#008fe0', cursor: 'pointer' }}
+              style={{
+                color: '#008fe0',
+                cursor: 'pointer',
+                display: disabled ? 'none' : 'inline',
+              }}
               type="link"
               onClick={() => {
                 this.addPeerRule(itemDetail);
@@ -1091,9 +1099,20 @@ class RuleObjectComponent extends Component {
               添加条件
             </span>
             {needShowReqCondition && (
-              <span style={{ marginLeft: 10 }}>
+              <span
+                style={{
+                  marginLeft: 10,
+                  display: disabled ? 'none' : 'inline',
+                }}
+              >
                 <Button
                   type="link"
+                  disabled={
+                    disabled &&
+                    (!itemDetail.reqConditionData ||
+                      !itemDetail.reqConditionData.reqParamName ||
+                      !itemDetail.reqConditionData.params?.length)
+                  }
                   style={{ padding: 0, height: 'auto' }}
                   onClick={() => this.handleReqConditionToggle(itemDetail)}
                 >
@@ -1103,21 +1122,32 @@ class RuleObjectComponent extends Component {
                 </Button>
               </span>
             )}
-            {itemDetail.isReqCondition && itemDetail.reqConditionData && (
-              <div
-                style={{
-                  marginTop: 10,
-                  display: 'flex',
-                  alignItems: 'center',
-                  background: '#f5f5f5',
-                  padding: '10px',
-                  borderRadius: '4px',
-                }}
-              >
+            {(itemDetail.isReqCondition ||
+              (disabled &&
+                itemDetail.reqConditionData &&
+                itemDetail.reqConditionData.reqParamName &&
+                itemDetail.reqConditionData.params?.length)) &&
+              itemDetail.reqConditionData && (
+                <div
+                  style={{
+                    marginTop: 10,
+                    display:
+                      disabled &&
+                      (!itemDetail.reqConditionData.reqParamName ||
+                        !itemDetail.reqConditionData.params?.length)
+                        ? 'none'
+                        : 'flex',
+                    alignItems: 'center',
+                    background: '#f5f5f5',
+                    padding: '10px',
+                    borderRadius: '4px',
+                  }}
+                >
                 <span style={{ marginRight: 8, flexShrink: 0 }}>
                   请求参数名称:
                 </span>
                 <Input
+                  disabled={disabled}
                   style={{ width: 150, marginRight: 10 }}
                   value={itemDetail.reqConditionData.reqParamName}
                   onChange={(e) =>
@@ -1131,6 +1161,7 @@ class RuleObjectComponent extends Component {
 
                 <span style={{ marginRight: 8, flexShrink: 0 }}>类型:</span>
                 <Select
+                  disabled={disabled}
                   style={{ width: 120, marginRight: 10 }}
                   value={itemDetail.reqConditionData.dataTypeCode}
                   onChange={(val) =>
@@ -1145,6 +1176,7 @@ class RuleObjectComponent extends Component {
                 </Select>
 
                 <Select
+                  disabled={disabled}
                   style={{ width: 120, marginRight: 10 }}
                   value={itemDetail.reqConditionData.operationCode}
                   onChange={(val) =>
@@ -1152,10 +1184,11 @@ class RuleObjectComponent extends Component {
                   }
                 >
                   {[
-        { 'code': 'eq', 'name': '等于' },
-        { 'code': 'cn', 'name': '包含' },
-        { code: 'gt', name: '大于' },
-        { code: 'lt', name: '小于' },
+        { 'code': '1', 'name': '在集合' },
+        { 'code': '2', 'name': '不等于' },
+        { code: '3', name: '小于' },
+        { code: '4', name: '大于' },
+        { code: '5', name: '等于' },
       ].map((op) => (
                     <Select.Option key={op.code} value={op.code}>
                       {op.name}
@@ -1770,9 +1803,9 @@ class RuleObjectComponent extends Component {
     if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
       itemDetail.reqConditionData = {
         operationType: 'relation',
-        dataTypeCode: '21',
-        entityInputType: '21',
-        entityValueType: '21',
+        dataTypeCode: '10',
+        entityInputType: '10',
+        entityValueType: '10',
         operationCode: '',
         reqParamName: '',
         params: [],