@bit-sun/business-component 4.0.13-alpha.22 → 4.0.13-alpha.24

package/dist/index.esm.js

@@ -6471,10 +6471,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, /*#__PURE__*/React$1.createElement(Space, null, /*#__PURE__*/React$1.createElement(Button, {
     key: "search",
     type: "primary",
-    onClick: onSearchTable
+    onClick: onSearchTable,
+    disabled: fetching
   }, "\u67E5\u8BE2 Enter"), /*#__PURE__*/React$1.createElement(Button, {
     key: "reset",
-    onClick: onResetTable
+    onClick: onResetTable,
+    disabled: fetching
   }, "\u91CD\u7F6E ctrl+U"), /*#__PURE__*/React$1.createElement("div", {
     style: {
       position: 'absolute',
@@ -10212,11 +10214,11 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'itemCode'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '商品名称(SPU)'
-    }, {
       name: 'qp-itemCode-like',
       label: '商品编码(SPU)'
+    }, {
+      name: 'qp-name-like',
+      label: '商品名称(SPU)'
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -37229,14 +37231,15 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
-      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$;
+      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2, _itemDetail$params2$;
       var ruleTreeData = _this.state.ruleTreeData;
       var _this$props3 = _this.props,
         callBack = _this$props3.callBack,
         _this$props3$initialT = _this$props3.initialThresholdQuery,
         initialThresholdQuery = _this$props3$initialT === void 0 ? {} : _this$props3$initialT,
         disabled = _this$props3.disabled,
-        systemVariableList = _this$props3.systemVariableList;
+        systemVariableList = _this$props3.systemVariableList,
+        needShowInsertSQL = _this$props3.needShowInsertSQL;
       var thresholdQuery = _objectSpread2(_objectSpread2({}, initialThresholdQuery), relateDatas);
       var finalIndex = floorIndex + 1;
       var queryIdentify = '';
@@ -37328,6 +37331,9 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           itemDetail.dataTypeCode = nodeInfo.triggerNode.props.dataTypeCode;
           itemDetail.metaObjectCode = nodeInfo.triggerNode.props.metaObjectCode;
           itemDetail.isInsertParam = false;
+          if (needShowInsertSQL) {
+            itemDetail.isInsertSQL = false;
+          }
           _this.setState({
             ruleClassData: ruleClassData
           }, function () {
@@ -37359,7 +37365,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: item.code,
           key: item.code
         }, item.name);
-      })), !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) ? /*#__PURE__*/React$1.createElement(RuleField, {
+      })), (needShowInsertSQL ? !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) && !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) : !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam)) ? /*#__PURE__*/React$1.createElement(RuleField, {
         customerWidth: _this.props.customerWidth,
         selectOperation: (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) || '',
         disabled: disabled,
@@ -37409,7 +37415,26 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: item.code,
           key: item.code
         }, item.name);
-      }) : null), /*#__PURE__*/React$1.createElement(PlusCircleOutlined, {
+      }) : null), /*#__PURE__*/React$1.createElement(Input, {
+        disabled: disabled,
+        value: (itemDetail === null || itemDetail === void 0 ? void 0 : (_itemDetail$params2 = itemDetail.params) === null || _itemDetail$params2 === void 0 ? void 0 : (_itemDetail$params2$ = _itemDetail$params2[0]) === null || _itemDetail$params2$ === void 0 ? void 0 : _itemDetail$params2$.replace('{', '').replace('}', '')) || '',
+        style: {
+          width: '150px',
+          marginLeft: '10px',
+          display: needShowInsertSQL && (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '' : 'none'
+        },
+        onChange: function onChange(e) {
+          var value = e.target.value;
+          var ruleClassData = _this.state.ruleClassData;
+          itemDetail.params = [value || ''];
+          itemDetail.paramNames = [value || ''];
+          _this.setState({
+            ruleClassData: ruleClassData
+          }, function () {
+            callBack(ruleClassData);
+          });
+        }
+      }), /*#__PURE__*/React$1.createElement(PlusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
           _this.addChildRules(itemDetail);
@@ -37451,7 +37476,27 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             message$1.warn('未配置规则变量');
           }
         }
-      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) ? '取消插入参数' : '插入参数')), /*#__PURE__*/React$1.createElement("div", {
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) ? '取消插入参数' : '插入参数'), /*#__PURE__*/React$1.createElement(Button, {
+        type: "link",
+        disabled: disabled || (itemDetail.operationCode === '' || !itemDetail.operationCode ? true : false),
+        style: needShowInsertSQL ? {} : {
+          display: 'none'
+        },
+        onClick: function onClick() {
+          var ruleClassData = _this.state.ruleClassData;
+          itemDetail.isInsertSQL = !itemDetail.isInsertSQL;
+          if (itemDetail.isInsertSQL) {
+            itemDetail.type = 30;
+            itemDetail.paramNames = [];
+            itemDetail.params = [];
+          }
+          _this.setState({
+            ruleClassData: ruleClassData
+          }, function () {
+            callBack(ruleClassData);
+          });
+        }
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '取消插入SQL' : '插入SQL')), /*#__PURE__*/React$1.createElement("div", {
         style: {
           display: itemDetail.operationType == 'logic' && !disabled ? 'block' : 'none'
         }

package/dist/index.js

@@ -6494,10 +6494,12 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     key: "search",
     type: "primary",
-    onClick: onSearchTable
+    onClick: onSearchTable,
+    disabled: fetching
   }, "\u67E5\u8BE2 Enter"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     key: "reset",
-    onClick: onResetTable
+    onClick: onResetTable,
+    disabled: fetching
   }, "\u91CD\u7F6E ctrl+U"), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       position: 'absolute',
@@ -10235,11 +10237,11 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'itemCode'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '商品名称(SPU)'
-    }, {
       name: 'qp-itemCode-like',
       label: '商品编码(SPU)'
+    }, {
+      name: 'qp-name-like',
+      label: '商品名称(SPU)'
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -37252,14 +37254,15 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
-      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$;
+      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2, _itemDetail$params2$;
       var ruleTreeData = _this.state.ruleTreeData;
       var _this$props3 = _this.props,
         callBack = _this$props3.callBack,
         _this$props3$initialT = _this$props3.initialThresholdQuery,
         initialThresholdQuery = _this$props3$initialT === void 0 ? {} : _this$props3$initialT,
         disabled = _this$props3.disabled,
-        systemVariableList = _this$props3.systemVariableList;
+        systemVariableList = _this$props3.systemVariableList,
+        needShowInsertSQL = _this$props3.needShowInsertSQL;
       var thresholdQuery = _objectSpread2(_objectSpread2({}, initialThresholdQuery), relateDatas);
       var finalIndex = floorIndex + 1;
       var queryIdentify = '';
@@ -37351,6 +37354,9 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           itemDetail.dataTypeCode = nodeInfo.triggerNode.props.dataTypeCode;
           itemDetail.metaObjectCode = nodeInfo.triggerNode.props.metaObjectCode;
           itemDetail.isInsertParam = false;
+          if (needShowInsertSQL) {
+            itemDetail.isInsertSQL = false;
+          }
           _this.setState({
             ruleClassData: ruleClassData
           }, function () {
@@ -37382,7 +37388,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: item.code,
           key: item.code
         }, item.name);
-      })), !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) ? /*#__PURE__*/React__default['default'].createElement(RuleField, {
+      })), (needShowInsertSQL ? !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) && !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) : !(itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam)) ? /*#__PURE__*/React__default['default'].createElement(RuleField, {
         customerWidth: _this.props.customerWidth,
         selectOperation: (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) || '',
         disabled: disabled,
@@ -37432,7 +37438,26 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: item.code,
           key: item.code
         }, item.name);
-      }) : null), /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleOutlined, {
+      }) : null), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+        disabled: disabled,
+        value: (itemDetail === null || itemDetail === void 0 ? void 0 : (_itemDetail$params2 = itemDetail.params) === null || _itemDetail$params2 === void 0 ? void 0 : (_itemDetail$params2$ = _itemDetail$params2[0]) === null || _itemDetail$params2$ === void 0 ? void 0 : _itemDetail$params2$.replace('{', '').replace('}', '')) || '',
+        style: {
+          width: '150px',
+          marginLeft: '10px',
+          display: needShowInsertSQL && (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '' : 'none'
+        },
+        onChange: function onChange(e) {
+          var value = e.target.value;
+          var ruleClassData = _this.state.ruleClassData;
+          itemDetail.params = [value || ''];
+          itemDetail.paramNames = [value || ''];
+          _this.setState({
+            ruleClassData: ruleClassData
+          }, function () {
+            callBack(ruleClassData);
+          });
+        }
+      }), /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
           _this.addChildRules(itemDetail);
@@ -37474,7 +37499,27 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             antd.message.warn('未配置规则变量');
           }
         }
-      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) ? '取消插入参数' : '插入参数')), /*#__PURE__*/React__default['default'].createElement("div", {
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertParam) ? '取消插入参数' : '插入参数'), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        type: "link",
+        disabled: disabled || (itemDetail.operationCode === '' || !itemDetail.operationCode ? true : false),
+        style: needShowInsertSQL ? {} : {
+          display: 'none'
+        },
+        onClick: function onClick() {
+          var ruleClassData = _this.state.ruleClassData;
+          itemDetail.isInsertSQL = !itemDetail.isInsertSQL;
+          if (itemDetail.isInsertSQL) {
+            itemDetail.type = 30;
+            itemDetail.paramNames = [];
+            itemDetail.params = [];
+          }
+          _this.setState({
+            ruleClassData: ruleClassData
+          }, function () {
+            callBack(ruleClassData);
+          });
+        }
+      }, (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'
         }

package/package.json

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

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -522,8 +522,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '商品名称(SPU)' },
       { name: 'qp-itemCode-like', label: '商品编码(SPU)' },
+      { name: 'qp-name-like', label: '商品名称(SPU)' },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {

package/src/components/Functional/SearchSelect/index.tsx

@@ -956,10 +956,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                     {renderFormItem(modalTableProps?.tableSearchForm)}
                     <Col span={6}>
                       <Space>
-                        <Button key="search" type="primary" onClick={onSearchTable}>
+                        <Button key="search" type="primary" onClick={onSearchTable} disabled={fetching}>
                           查询 Enter
                         </Button>
-                        <Button key="reset" onClick={onResetTable}>
+                        <Button key="reset" onClick={onResetTable} disabled={fetching}>
                           重置 ctrl+U
                         </Button>
                         <div style={{position: 'absolute',top: 0,right: 0}}>

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

@@ -688,6 +688,7 @@ class RuleObjectComponent extends Component {
       initialThresholdQuery = {},
       disabled,
       systemVariableList,
+      needShowInsertSQL,
     } = this.props;
     let thresholdQuery = {
       ...initialThresholdQuery,
@@ -825,6 +826,9 @@ class RuleObjectComponent extends Component {
                   itemDetail.metaObjectCode =
                     nodeInfo.triggerNode.props.metaObjectCode;
                   itemDetail.isInsertParam = false;
+                  if(needShowInsertSQL) {
+                    itemDetail.isInsertSQL = false;
+                  }
                   this.setState(
                     {
                       ruleClassData,
@@ -862,7 +866,7 @@ class RuleObjectComponent extends Component {
                   ),
                 )}
               </Select>
-              {!itemDetail?.isInsertParam ? (
+              {(needShowInsertSQL ? (!itemDetail?.isInsertParam&&!itemDetail?.isInsertSQL): !itemDetail?.isInsertParam) ? (
                 <RuleField
                   customerWidth={this.props.customerWidth}
                   selectOperation={itemDetail?.operationCode || ''}
@@ -926,6 +930,30 @@ class RuleObjectComponent extends Component {
                     ))
                   : null}
               </Select>
+              <Input
+                disabled={disabled}
+                value={itemDetail?.params?.[0]?.replace('{', '').replace('}', '') ||''}
+                style={{
+                  width: '150px',
+                  marginLeft: '10px',
+                  display: needShowInsertSQL && itemDetail?.isInsertSQL ? '' : 'none',
+                }}
+                onChange={(e) => {
+                  const value = e.target.value;
+                  const { ruleClassData } = this.state;
+                  itemDetail.params = [value || ''];
+                  itemDetail.paramNames = [value || ''];
+                  this.setState(
+                    {
+                      ruleClassData,
+                    },
+                    () => {
+                      callBack(ruleClassData);
+                    },
+                  );
+                }}
+              >
+              </Input>
               <PlusCircleOutlined
                 className={'icon_btn_style'}
                 onClick={() => {
@@ -985,6 +1013,36 @@ class RuleObjectComponent extends Component {
               >
                 {itemDetail?.isInsertParam ? '取消插入参数' : '插入参数'}
               </Button>
+              <Button
+                type="link"
+                disabled={
+                  disabled ||
+                  (itemDetail.operationCode === '' || !itemDetail.operationCode
+                    ? true
+                    : false)
+                }
+                style={needShowInsertSQL?{}:{ display: 'none'}}
+                onClick={() => {
+                  const { ruleClassData } = this.state;
+                  itemDetail.isInsertSQL = !itemDetail.isInsertSQL;
+                  if (itemDetail.isInsertSQL) {
+                    itemDetail.type = 30;
+                    itemDetail.paramNames = [];
+                    itemDetail.params = [];
+                  }
+
+                  this.setState(
+                    {
+                      ruleClassData,
+                    },
+                    () => {
+                      callBack(ruleClassData);
+                    },
+                  );
+                }}
+              >
+                {itemDetail?.isInsertSQL ? '取消插入SQL' : '插入SQL'}
+              </Button>
             </div>
           )}
           <div