@bit-sun/business-component 2.3.26 → 2.3.28

package/dist/index.js

@@ -6699,6 +6699,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
     case 'purchaseOrg':
     case 'salesOrg':
     case 'employee2':
+    case 'role':
       result = '/user';
       break;
     case 'deliveryMode':
@@ -8654,6 +8655,84 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }]
     }, modalTableBusProps);
   }
+  // 角色选择器
+  if (type === 'role') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/role"),
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-status-eq': 10,
+        sorter: 'desc-id'
+      },
+      sourceName: 'roleCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '角色名称'
+    }, {
+      name: 'qp-code-like',
+      label: '角色编码'
+    }, {
+      name: 'qp-categoryCode-eq',
+      type: 'select',
+      label: '角色分类',
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }];
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/permissionCategory"), {
+      pageSize: 5000,
+      currentPage: 1
+    })]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择角色',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '角色编码',
+        dataIndex: 'code'
+      }, {
+        title: '角色名称',
+        dataIndex: 'name',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        title: '角色分类',
+        dataIndex: 'categoryName',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'remark',
+        title: '角色描述',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'applicationName',
+        title: '应用',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }]
+    }, modalTableBusProps);
+  }
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig,
@@ -24401,6 +24480,14 @@ var inputTypes = {
       props: _objectSpread2({
         treeCheckable: false
       }, normalSingleSelectProps)
+    },
+    360: {
+      type: 'bs-roleSelect',
+      props: _objectSpread2(_objectSpread2({}, normalSingleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
     }
   },
   30: {
@@ -24558,6 +24645,14 @@ var inputTypes = {
       props: _objectSpread2({
         treeCheckable: false
       }, normalSingleSelectProps)
+    },
+    360: {
+      type: 'bs-roleSelect',
+      props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
     }
   }
 };
@@ -24589,7 +24684,8 @@ var choiceType = Object.freeze({
   310: '配送方式选择器',
   330: '变量',
   340: '规则模板选择器',
-  350: '营销区域选择器'
+  350: '营销区域选择器',
+  360: '角色选择器'
 });
 var inputType = {
   10: '输入',
@@ -26619,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) {
@@ -26789,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'
       };
@@ -28700,6 +28796,120 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
+        // 角色选择器
+        if (dataChoiceBusinessType == 360) {
+          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[0],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[0] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[0] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[0] = [value.key];
+                  valueNames[0] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[1],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[1] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[1] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[1] = [value.key];
+                  valueNames[1] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }));
+          } else {
+            var _values12;
+            var _currentValue11 = dataInputBusinessType === 12 ? ((_values12 = values) === null || _values12 === void 0 ? void 0 : _values12.map(function (s, vIndex) {
+              return {
+                key: s,
+                label: valueNames[vIndex]
+              };
+            })) || [] : values[0] && {
+              key: values[0],
+              label: valueNames[0]
+            } || {};
+            return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: _currentValue11,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values = value.map(function (i) {
+                    return i.key;
+                  }) || [];
+                  valueNames = value.map(function (i) {
+                    return i.label || '';
+                  }) || [];
+                } else {
+                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
+                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            });
+          }
+        }
       } else {
         if (dataTypeCode == 22 || dataTypeCode == 21 || dataTypeCode == 24 || dataTypeCode == 23) {
           //数值22, 字符串21, 布尔类型24, long23
@@ -28735,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'
@@ -28764,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: {
@@ -29848,18 +30058,18 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'or');
           }
-        }, "OR"), /*#__PURE__*/React__default['default'].createElement("p", {
+        }, "\u6216\u8005"), /*#__PURE__*/React__default['default'].createElement("p", {
           className: 'choose_logical_type',
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'and');
           }
-        }, "AND")),
+        }, "\u5E76\u4E14")),
         trigger: "focus"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
         disabled: disabled,
         type: "link",
         className: 'logical_item_btn'
-      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? 'OR' : 'AND', /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, {
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? '或者' : '并且', /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, {
         style: {
           marginLeft: '6px'
         }
@@ -30142,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,
@@ -30536,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/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => JSX.Element;
+        render: (text: any, record: any) => React.JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => JSX.Element;
+        render: () => React.JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,12 +53,12 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
+    DraggableContainer: (props: any) => React.JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export default TableColumnSetting;

package/package.json

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

package/src/components/Business/JsonQueryTable/static.ts

@@ -169,6 +169,15 @@ export const inputTypes:any = {
         ...normalSingleSelectProps,
       },
     },
+    360: {
+      type: 'bs-roleSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in',
+        },
+      },
+    },
   },
   30: {
     10: {
@@ -343,6 +352,15 @@ export const inputTypes:any = {
         ...normalSingleSelectProps,
       },
     },
+    360: {
+      type: 'bs-roleSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in',
+        },
+      },
+    },
   },
 };
 
@@ -384,6 +402,7 @@ export const choiceType = Object.freeze({
   330: '变量',
   340: '规则模板选择器',
   350: '营销区域选择器',
+  360: '角色选择器',
 });
 export const inputType:any ={
   10: '输入',

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

@@ -1758,5 +1758,79 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+  // 角色选择器
+  if(type === 'role') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/role`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-status-eq': 10, // 10启用 20禁用
+        sorter: 'desc-id',
+      }, // 默认参数
+      sourceName: 'roleCode',
+      ...requestConfigProp
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '角色名称' },
+      { name: 'qp-code-like', label: '角色编码' },
+      { name: 'qp-categoryCode-eq', type: 'select', label: '角色分类', field: {
+          type: 'select',
+          props: {
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        }
+      },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/permissionCategory`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择角色',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '角色编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '角色名称',
+          dataIndex: 'name',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          title: '角色分类',
+          dataIndex: 'categoryName',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'remark',
+          title: '角色描述',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'applicationName',
+          title: '应用',
+          render: (text: any) => handleTextOverflow(text),
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   return { modalTableProps, requestConfig, needModalTable };
 }

package/src/components/Business/SearchSelect/index.md

@@ -1326,4 +1326,61 @@ export default () => {
 };
 ```
 
+# 角色选择器 Select-ROLE-001
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+const { TabPane } = Tabs;
+
+export default () => {
+  const selectProps = {
+    // mode: 'multiple',
+    // maxTagCount: 1,
+    // disabled: true
+  }
+  const selectPropsMultiple = {
+    mode: 'multiple',
+    maxTagCount: 1,
+  }
+
+  const [ tabKey, setTabKey ] = useState('single')
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    selectProps,
+    selectBusinessType: 'role',
+  };
+
+  const onTabChange = (key) => {
+    setTabKey(key)
+    setValue(key === 'single' ? null: [])
+  }
+  
+  return (
+    <div>
+      <Tabs onChange={onTabChange} activeKey={tabKey}>
+        <TabPane tab='单选' key='single'>
+          {tabKey === 'single' && (
+            <BusinessSearchSelect {...props} />
+          )}
+        </TabPane>
+        <TabPane tab='多选' key='multiple'>
+          {tabKey === 'multiple' && (
+            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+          )}
+        </TabPane>
+      </Tabs>
+    </div>
+  );
+};
+```
+
 More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/Business/SearchSelect/utils.ts

@@ -84,7 +84,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse': case 'ownerWarehouse':
       result =  '/stock';
       break;
-    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2':
+    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2': case 'role':
       result =  '/user';
       break;
     case 'deliveryMode': case 'ruleTemplate':

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 {
@@ -656,7 +658,7 @@ class RuleObjectComponent extends Component {
                     this.handleLogicalTypeChange(itemDetail, 'or');
                   }}
                 >
-                  OR
+                  或者
                 </p>
                 <p
                   className={'choose_logical_type'}
@@ -664,7 +666,7 @@ class RuleObjectComponent extends Component {
                     this.handleLogicalTypeChange(itemDetail, 'and');
                   }}
                 >
-                  AND
+                  并且
                 </p>
               </div>
             }
@@ -675,7 +677,7 @@ class RuleObjectComponent extends Component {
               type="link"
               className={'logical_item_btn'}
             >
-              {itemDetail?.operationCode == 'or' ? 'OR' : 'AND'}
+              {itemDetail?.operationCode == 'or' ? '或者' : '并且'}
               <DownOutlined style={{ marginLeft: '6px' }} />
             </Button>
           </Popover>
@@ -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' }}>