@bit-sun/business-component 2.3.27 → 2.3.28

package/dist/index.esm.js

@@ -26696,6 +26696,8 @@ var findChangedThresholdQuery = function findChangedThresholdQuery(oldVal, newVa
 var isObj = function isObj(object) {
   return object && _typeof(object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == '[object object]';
 };
+var dateFormat = 'YYYY-MM-DD';
+var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
 
 var RangePicker = DatePicker.RangePicker;
 var RuleField = /*#__PURE__*/function (_Component) {
@@ -26866,8 +26868,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
         disabled = _this$props2.disabled,
         customerWidth = _this$props2.customerWidth;
       var thresholdList = _this.state.thresholdList;
-      var dateFormat = 'YYYY-MM-DD';
-      var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
       var styleCommon = {
         width: customerWidth || '150px'
       };
@@ -28926,12 +28926,11 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             });
           }
-        } else if (dataTypeCode == 41) {
-          // 日期41
+        } else if (dataTypeCode == 41 || dataTypeCode == 32) {
+          // 日期41 日期时间32
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React.createElement(RangePicker
-            // showTime
-            , {
+            return /*#__PURE__*/React.createElement(RangePicker, {
+              showTime: dataTypeCode == 32,
               disabled: disabled,
               style: {
                 width: customerWidth || '300px'
@@ -28955,6 +28954,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           } else {
             return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DatePicker, {
+              showTime: dataTypeCode == 32,
               format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
               disabled: disabled,
               style: {
@@ -30333,7 +30333,9 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         onChange: function onChange(value) {
           handleEdit(ites.code, value);
         }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 41 && /*#__PURE__*/React.createElement(DatePicker, {
+      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && ((ites === null || ites === void 0 ? void 0 : ites.valueType) === 41 || (ites === null || ites === void 0 ? void 0 : ites.valueType) === 32) && /*#__PURE__*/React.createElement(DatePicker, {
+        showTime: dataTypeCode == 32,
+        format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
         disabled: disabled,
         defaultValue: ites.defaultValue,
         style: style2,
@@ -30727,6 +30729,27 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         getPopupContainer: function getPopupContainer() {
           return document.body;
         }
+      }) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 360 && /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
+        selectBusinessType: "role",
+        selectProps: _objectSpread2({
+          style: styleCommon,
+          placeholder: '请选择角色'
+        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+          mode: 'multiple',
+          maxTagCount: 1
+        } : {}),
+        disabled: disabled,
+        labelInValue: true,
+        value: showValue(ites.code),
+        requestConfig: {
+          filterInit: 'qp-code-in'
+        },
+        onChange: function onChange(value) {
+          handleEdit(ites.code, value);
+        },
+        getPopupContainer: function getPopupContainer() {
+          return document.body;
+        }
       }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 40 && /*#__PURE__*/React.createElement("div", {
         style: {
           display: 'flex'

package/dist/index.js

@@ -26715,6 +26715,8 @@ var findChangedThresholdQuery = function findChangedThresholdQuery(oldVal, newVa
 var isObj = function isObj(object) {
   return object && _typeof(object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == '[object object]';
 };
+var dateFormat = 'YYYY-MM-DD';
+var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
 
 var RangePicker = antd.DatePicker.RangePicker;
 var RuleField = /*#__PURE__*/function (_Component) {
@@ -26885,8 +26887,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
         disabled = _this$props2.disabled,
         customerWidth = _this$props2.customerWidth;
       var thresholdList = _this.state.thresholdList;
-      var dateFormat = 'YYYY-MM-DD';
-      var fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
       var styleCommon = {
         width: customerWidth || '150px'
       };
@@ -28945,12 +28945,11 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             });
           }
-        } else if (dataTypeCode == 41) {
-          // 日期41
+        } else if (dataTypeCode == 41 || dataTypeCode == 32) {
+          // 日期41 日期时间32
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
-            return /*#__PURE__*/React__default['default'].createElement(RangePicker
-            // showTime
-            , {
+            return /*#__PURE__*/React__default['default'].createElement(RangePicker, {
+              showTime: dataTypeCode == 32,
               disabled: disabled,
               style: {
                 width: customerWidth || '300px'
@@ -28974,6 +28973,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           } else {
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, {
+              showTime: dataTypeCode == 32,
               format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
               disabled: disabled,
               style: {
@@ -30352,7 +30352,9 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         onChange: function onChange(value) {
           handleEdit(ites.code, value);
         }
-      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && (ites === null || ites === void 0 ? void 0 : ites.valueType) === 41 && /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, {
+      }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 10 && ((ites === null || ites === void 0 ? void 0 : ites.valueType) === 41 || (ites === null || ites === void 0 ? void 0 : ites.valueType) === 32) && /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, {
+        showTime: dataTypeCode == 32,
+        format: dataTypeCode == 41 ? dateFormat : fullDateFormat,
         disabled: disabled,
         defaultValue: ites.defaultValue,
         style: style2,
@@ -30746,6 +30748,27 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         getPopupContainer: function getPopupContainer() {
           return document.body;
         }
+      }) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 360 && /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+        selectBusinessType: "role",
+        selectProps: _objectSpread2({
+          style: styleCommon,
+          placeholder: '请选择角色'
+        }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
+          mode: 'multiple',
+          maxTagCount: 1
+        } : {}),
+        disabled: disabled,
+        labelInValue: true,
+        value: showValue(ites.code),
+        requestConfig: {
+          filterInit: 'qp-code-in'
+        },
+        onChange: function onChange(value) {
+          handleEdit(ites.code, value);
+        },
+        getPopupContainer: function getPopupContainer() {
+          return document.body;
+        }
       }) || null, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 40 && /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
           display: 'flex'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.3.27",
+  "version": "2.3.28",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -31,6 +31,8 @@ import {
   getSpecialPropertyCode,
   getPropertyCode,
   isObj,
+  dateFormat,
+  fullDateFormat
 } from './util';
 import { getDictionarySource, uuid } from '../../../utils/utils';
 import {
@@ -1047,8 +1049,10 @@ class RuleObjectComponent extends Component {
           )) ||
           null}
         {/* 输入/日期  */}
-        {(ites?.inputType === 10 && ites?.valueType === 41 && (
+        {(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}
@@ -1562,6 +1566,34 @@ class RuleObjectComponent extends Component {
             />
           )) ||
           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' }}>

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',
     };
@@ -2168,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}
@@ -2209,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';