@bit-sun/business-component 2.4.23 → 2.4.24

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

@@ -44,6 +44,7 @@ import {
 import { request } from 'bssula';
 import Formula from './Formula';
 import RenderSpecificAction from './renderSpecificAction';
+import RenderCompItem from './RenderCompItem';
 import InnerSelect from './InnerSelect';
 
 const { RangePicker } = DatePicker;
@@ -188,6 +189,7 @@ class RuleObjectComponent extends Component {
           `${rootObjCode}.${parentKey}.${element.code}`
         ] = infoVo?.dictionaryCode;
       } else if (element.choiceType === 10) {
+        // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115669
         const list =
           (Object.keys(infoVo).length &&
             infoVo.enumeration &&
@@ -658,7 +660,7 @@ class RuleObjectComponent extends Component {
                     this.handleLogicalTypeChange(itemDetail, 'or');
                   }}
                 >
-                  或者
+                  OR
                 </p>
                 <p
                   className={'choose_logical_type'}
@@ -666,7 +668,7 @@ class RuleObjectComponent extends Component {
                     this.handleLogicalTypeChange(itemDetail, 'and');
                   }}
                 >
-                  并且
+                  AND
                 </p>
               </div>
             }
@@ -677,7 +679,7 @@ class RuleObjectComponent extends Component {
               type="link"
               className={'logical_item_btn'}
             >
-              {itemDetail?.operationCode == 'or' ? '或者' : '并且'}
+              {itemDetail?.operationCode == 'or' ? 'OR' : 'AND'}
               <DownOutlined style={{ marginLeft: '6px' }} />
             </Button>
           </Popover>
@@ -698,6 +700,7 @@ class RuleObjectComponent extends Component {
             })
           ) : (
             <div style={{ display: 'flex', alignItems: 'center' }}>
+            {/* todo */}
               <TreeSelect
                 value={itemDetail.propertyPath}
                 disabled={disabled}
@@ -790,7 +793,6 @@ class RuleObjectComponent extends Component {
                 }}
                 onChange={(value) => {
                   const { ruleClassData } = this.state;
-                  console.log(itemDetail);
                   itemDetail.params = [(value && `{${value}}`) || ''];
                   const name = systemVariableList.find(
                     (i) => i.code == value,
@@ -980,648 +982,6 @@ class RuleObjectComponent extends Component {
     );
   };
 
-  renderCompItem = (ites, showValue, handleEdit,disabled) => {
-    const { regularDataList } = this.props;
-    let fieldListGroup = regularDataList.map((item) => {
-      const Item = {
-        id: item.id,
-        code: item.code,
-        name: item.name,
-        value: item.code,
-      };
-      if (item.propertyList) {
-        Item.propertyList = item.propertyList.map((field) => ({
-          id: field.id,
-          code: field.code,
-          name: field.name,
-          value: `${item.code}.${field.code}`,
-          valueText: `${item.name}.${field.name}`,
-        }));
-      }
-      return Item;
-    });
-    if (!ites) return;
-    const styleCommon = {
-      width: '200px',
-      ...(ites?.rightText ? { marginLeft: 10 } : {}),
-    };
-    const style2 = {
-      width: '100px',
-    };
-    return (
-      <>
-        {/* 输入/字符串  */}
-        {(ites?.inputType === 10 && ites?.valueType === 21 && (
-          <Input
-            disabled={disabled}
-            allowClear={true}
-            onClear={() => {
-              handleEdit(ites.code, undefined);
-            }}
-            defaultValue={showValue(ites.code, 'input')}
-            style={styleCommon}
-            onBlur={(e) => {
-              handleEdit(
-                ites.code,
-                String(e.target.value).trim() == ''
-                  ? undefined
-                  : e.target.value,
-              );
-            }}
-          />
-        )) ||
-          null}
-        {/* 输入 / 长整数23/小数22  */}
-        {(ites?.inputType === 10 &&
-          (ites?.valueType === 23 || ites?.valueType === 22) && (
-            <InputNumber
-              disabled={disabled}
-              max={Number.MAX_SAFE_INTEGER}
-              min={ites?.valueType === 23 ? 0 : Number.MIN_SAFE_INTEGER}
-              precision={ites?.valueType === 23 ? 0 : 2}
-              defaultValue={ites.defaultValue}
-              style={style2}
-              value={showValue(ites.code)}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-            />
-          )) ||
-          null}
-        {/* 输入/日期  */}
-        {(ites?.inputType === 10 && (ites?.valueType === 41 || ites?.valueType === 32) && (
-          <DatePicker
-            showTime={dataTypeCode == 32}
-            format={dataTypeCode == 41 ? dateFormat : fullDateFormat}
-            disabled={disabled}
-            defaultValue={ites.defaultValue}
-            style={style2}
-            value={showValue(ites.code)}
-            onChange={(value) => {
-              handleEdit(ites.code, value);
-            }}
-          />
-        )) ||
-          null}
-        {/* 输入/时间  */}
-        {(ites?.inputType === 10 && ites?.valueType === 40 && (
-          <RangePicker
-            showTime
-            disabled={disabled}
-            defaultValue={ites.defaultValue}
-            style={style2}
-            value={showValue(ites.code)}
-            onChange={(value) => {
-              handleEdit(ites.code, value);
-            }}
-          />
-        )) ||
-          null}
-        {/* 输入/布尔值  */}
-        {(ites?.inputType === 10 && ites?.valueType === 24 && (
-          <Switch
-            disabled={disabled}
-            defaultChecked={!!ites.defaultValue}
-            style={style2}
-            checked={showValue(ites.code)}
-            onChange={(value) => {
-              handleEdit(ites.code, value);
-            }}
-          />
-        )) ||
-          null}
-        {/* 单选/多选  自定义  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 10 && (
-            <Select
-              disabled={disabled}
-              allowClear
-              showArrow
-              {...(ites?.inputType === 30
-                ? {
-                    mode: 'multiple',
-                  }
-                : {})}
-              defaultValue={ites.defaultValue}
-              style={styleCommon}
-              value={showValue(ites.code)}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-            >
-              {Object.keys(ites.enumeration).map((it) => (
-                <Select.Option key={it} value={it}>
-                  {ites.enumeration[it]}
-                </Select.Option>
-              ))}
-            </Select>
-          )) ||
-          null}
-        {/* 单选/多选  数据字典  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 20 && (
-            <InnerSelect
-              disabled={disabled}
-              inputType={ites?.inputType}
-              defaultValue={ites.defaultValue}
-              styleCommon={styleCommon}
-              value={showValue(ites.code)}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              dictionaryCode={ites.dictionaryCode}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  仓库选择器(物理仓)  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 110 && (
-            <BusinessSearchSelect
-              selectBusinessType="physicalWarehouse"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择物理仓',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                mappingValueField: 'physicalWarehouseCode',
-                filterInit: 'qp-physicalWarehouseCode-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  仓库选择器(逻辑仓)  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 120 && (
-            <BusinessSearchSelect
-              selectBusinessType="realWarehouse"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择逻辑仓',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                mappingValueField: 'realWarehouseCode',
-                filterInit: 'qp-realWarehouseCode-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  仓库选择器(虚拟仓)  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 130 && (
-            <BusinessSearchSelect
-              selectBusinessType="virtualWarehouse"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择虚拟仓',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                mappingValueField: 'virtualWarehouseCode',
-                filterInit: 'qp-virtualWarehouseCode-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  仓库选择器(渠道仓)  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 140 && (
-            <BusinessSearchSelect
-              selectBusinessType="channelWarehouse"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择渠道仓',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                mappingValueField: 'channelWarehouseCode',
-                filterInit: 'qp-channelWarehouseCode-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  商品SPU选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 150 && (
-            <BusinessSearchSelect
-              selectBusinessType="spuCommodity"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择SPU',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-itemCode-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  商品SKU选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 160 && (
-            <BusinessSearchSelect
-              selectBusinessType="skuCommodity"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择商品',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-skuCode-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  省市区  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 190 && (
-            <BsCascader
-              disabled={disabled}
-              isAll={true}
-              needNameAndCode={true}
-              notChangeOnSelect={true}
-              initRequestSource={async () => {
-                return await request({
-                  url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                  method: 'get',
-                  converter: ({ data }) => {
-                    const handleData =
-                      data && data[0]
-                        ? data?.map((item) => {
-                            return {
-                              text: item.name,
-                              value: item.id,
-                              level: item.level,
-                              id: item.id,
-                            };
-                          })
-                        : [];
-                    return handleData;
-                  },
-                });
-              }}
-              value={showValue(ites.code)}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  行政组织选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 210 && (
-            <BusinessTreeSearchSelect
-              disabled={disabled}
-              treeCheckable={ites?.inputType === 30}
-              businessType="department"
-              labelInValue={true}
-              value={showValue(ites.code)}
-              style={styleCommon}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  采购组织选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 220 && (
-            <BusinessTreeSearchSelect
-              disabled={disabled}
-              treeCheckable={ites?.inputType === 30}
-              businessType="purchase-organization"
-              labelInValue={true}
-              value={showValue(ites.code)}
-              style={styleCommon}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  销售组织选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 230 && (
-            <BusinessTreeSearchSelect
-              disabled={disabled}
-              treeCheckable={ites?.inputType === 30}
-              businessType="sales-organization"
-              labelInValue={true}
-              value={showValue(ites.code)}
-              style={styleCommon}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  供应商选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 240 && (
-            <BusinessSearchSelect
-              selectBusinessType="supplier2"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择供应商',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-code-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  客户选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 250 && (
-            <BusinessSearchSelect
-              selectBusinessType="customer2"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择客户',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-code-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  店铺选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 260 && (
-            <BusinessSearchSelect
-              selectBusinessType="shopFile2"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择店铺',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-code-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  员工选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 270 && (
-            <BusinessSearchSelect
-              selectBusinessType="employee2"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择员工',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-id-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  库存组织选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 280 && (
-            <BusinessTreeSearchSelect
-              disabled={disabled}
-              treeCheckable={ites?.inputType === 30}
-              businessType="stock-organization"
-              labelInValue={true}
-              value={showValue(ites.code)}
-              style={styleCommon}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  结算组织选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 290 && (
-            <BusinessTreeSearchSelect
-              disabled={disabled}
-              treeCheckable={ites?.inputType === 30}
-              businessType="settle-organization"
-              labelInValue={true}
-              value={showValue(ites.code)}
-              style={styleCommon}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-        null}
-        {/* 单选/多选  配送方式选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 310 && (
-            <BusinessSearchSelect
-              selectBusinessType="deliveryMode"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择配送方式',
-                ...(ites?.inputType === 30
-                  ? {
-                      mode: 'multiple',
-                      maxTagCount: 1,
-                    }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-code-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-          null}
-        {/* 单选/多选  角色选择器  */}
-        {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 360 && (
-            <BusinessSearchSelect
-              selectBusinessType="role"
-              selectProps={{
-                style: styleCommon,
-                placeholder: '请选择角色',
-                ...(ites?.inputType === 30
-                  ? {
-                    mode: 'multiple',
-                    maxTagCount: 1,
-                  }
-                  : {}),
-              }}
-              disabled={disabled}
-              labelInValue={true}
-              value={showValue(ites.code)}
-              requestConfig={{
-                filterInit: 'qp-code-in',
-              }}
-              onChange={(value) => {
-                handleEdit(ites.code, value);
-              }}
-              getPopupContainer={() => document.body}
-            />
-          )) ||
-        null}
-        {/* 表达式 */}
-        {ites?.inputType === 40 && (
-          <div style={{ display: 'flex' }}>
-            <Formula
-              disabled={disabled}
-              key={showValue(ites.code)}
-              setValue={(val, formulaName) => {
-                console.log(val, 'val');
-                const value = val.map((item) => {
-                  return item.value.replace(
-                    /[a-zA-Z_]+\.\w+/g,
-                    (i) => '{' + i + '}',
-                  );
-                });
-                handleEdit(ites.code, value.join(''));
-                handleEdit({
-                  inputType: 40,
-                  formulaName,
-                });
-              }}
-              record={{ expression: showValue(ites.code) }}
-              sourceData={fieldListGroup}
-            />
-          </div>
-        )}
-      </>
-    );
-  };
 
   renderFormCompItem = (
     config,
@@ -1647,12 +1007,7 @@ class RuleObjectComponent extends Component {
           </div>
         )) ||
           null}
-        {this.renderCompItem(
-          config,
-          (a, b, c = parentItem, d = config) => showValue(a, b, c, d),
-          (a, b, c = parentItem, d = config) => handleEdit(a, b, c, d),
-          disabled
-        )}
+        <RenderCompItem regularDataList={this.props.regularDataList} ites={config} showValue={(a, b, c = parentItem, d = config) => showValue(a, b, c, d)} handleEdit={(a, b, c = parentItem, d = config) => handleEdit(a, b, c, d)} disabled={disabled}></RenderCompItem>
         {(config?.rightText && (
           <div style={{ flex: 'none', marginLeft: 10 }}>{config.rightText}</div>
         )) ||