@bit-sun/business-component 2.3.26 → 2.3.28

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

@@ -4,7 +4,7 @@ import styles from './index.less';
 import { getRegularThresholdRange } from './services';
 import moment from 'moment';
 import { handleError, judgeIsEmpty } from '../../../utils/utils';
-import { queryIdentityInfo, findChangedThresholdQuery, setParams } from './util';
+import { queryIdentityInfo, findChangedThresholdQuery, setParams, dateFormat, fullDateFormat } from './util';
 import { request as SulaRequest } from 'bssula';
 import { stringify } from 'querystring';
 import {
@@ -272,8 +272,6 @@ export default class RuleField extends Component {
       customerWidth,
     } = this.props;
     const { thresholdList } = this.state;
-    const dateFormat = 'YYYY-MM-DD';
-    const fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
     const styleCommon = {
       width: customerWidth || '150px',
     };
@@ -2014,6 +2012,112 @@ export default class RuleField extends Component {
           );
         }
       }
+      // 角色选择器
+      if (dataChoiceBusinessType == 360) {
+        if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+          return (
+            <>
+              <BusinessSearchSelect
+                selectBusinessType="role"
+                selectProps={{
+                  style: styleCommon,
+                  placeholder: '请选择角色',
+                  ...(dataInputBusinessType === 12
+                    ? {
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
+                    : {}),
+                }}
+                disabled={disabled}
+                labelInValue={true}
+                value={values[0]}
+                requestConfig={{
+                  filterInit: 'qp-code-in',
+                }}
+                onChange={(value) => {
+                  if (dataInputBusinessType === 12) {
+                    values[0] = value.map((i) => i.key);
+                    valueNames[0] = value.map((i) => i.label || '');
+                  } else {
+                    values[0] = [value.key];
+                    valueNames[0] = [value.label || ''];
+                  }
+                  callback(values, valueNames);
+                }}
+                getPopupContainer={() => document.body}
+              />
+              <span>~</span>
+              <BusinessSearchSelect
+                selectBusinessType="role"
+                selectProps={{
+                  style: styleCommon,
+                  placeholder: '请选择角色',
+                  ...(dataInputBusinessType === 12
+                    ? {
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
+                    : {}),
+                }}
+                disabled={disabled}
+                labelInValue={true}
+                value={values[1]}
+                requestConfig={{
+                  filterInit: 'qp-code-in',
+                }}
+                onChange={(value) => {
+                  if (dataInputBusinessType === 12) {
+                    values[1] = value.map((i) => i.key);
+                    valueNames[1] = value.map((i) => i.label || '');
+                  } else {
+                    values[1] = [value.key];
+                    valueNames[1] = [value.label || ''];
+                  }
+                  callback(values, valueNames);
+                }}
+                getPopupContainer={() => document.body}
+              />
+            </>
+          );
+        } else {
+          const currentValue = dataInputBusinessType === 12 ?
+            values?.map((s,vIndex)=> ({key: s, label: valueNames[vIndex]}))||[]
+            : values[0]&&{key:values[0],label:valueNames[0]}||{}
+          return (
+            <BusinessSearchSelect
+              selectBusinessType="role"
+              selectProps={{
+                style: styleCommon,
+                placeholder: '请选择角色',
+                ...(dataInputBusinessType === 12
+                  ? {
+                    mode: 'multiple',
+                    maxTagCount: 1,
+                  }
+                  : {}),
+              }}
+              disabled={disabled}
+              labelInValue={true}
+              value={currentValue}
+              requestConfig={{
+                filterInit: 'qp-code-in',
+              }}
+              onChange={(value) => {
+                if (dataInputBusinessType === 12) {
+                  values = value.map((i) => i.key)||[];
+                  valueNames = value.map((i) => i.label || '')||[];
+                } else {
+                  values = value?.key?[value.key]:[];
+                  valueNames = value?.label?[value.label]:[];
+                }
+                callback(values, valueNames);
+              }}
+              getPopupContainer={() => document.body}
+            />
+          );
+        }
+      }
     } else {
       if (
         dataTypeCode == 22 ||
@@ -2062,12 +2166,12 @@ export default class RuleField extends Component {
             />
           );
         }
-      } else if (dataTypeCode == 41) {
-        // 日期41
+      } else if (dataTypeCode == 41 || dataTypeCode == 32) {
+        // 日期41 日期时间32
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
             <RangePicker
-              // showTime
+              showTime={dataTypeCode == 32}
               disabled={disabled}
               style={{ width: customerWidth || '300px' }}
               format={dataTypeCode == 41 ? dateFormat : fullDateFormat}
@@ -2103,6 +2207,7 @@ export default class RuleField extends Component {
           return (
             <>
               <DatePicker
+                showTime={dataTypeCode == 32}
                 format={dataTypeCode == 41 ? dateFormat : fullDateFormat}
                 disabled={disabled}
                 style={{ width: customerWidth || '300px' }}

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

@@ -137,3 +137,7 @@ export const isObj = (object) => {
     Object.prototype.toString.call(object).toLowerCase() == '[object object]'
   );
 };
+
+
+export const dateFormat = 'YYYY-MM-DD';
+export const fullDateFormat = 'YYYY-MM-DD HH:mm:ss';