@bit-sun/business-component 2.3.26 → 2.3.27

package/dist/index.esm.js

@@ -6680,6 +6680,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
     case 'purchaseOrg':
     case 'salesOrg':
     case 'employee2':
+    case 'role':
       result = '/user';
       break;
     case 'deliveryMode':
@@ -8635,6 +8636,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,
@@ -24382,6 +24461,14 @@ var inputTypes = {
       props: _objectSpread2({
         treeCheckable: false
       }, normalSingleSelectProps)
+    },
+    360: {
+      type: 'bs-roleSelect',
+      props: _objectSpread2(_objectSpread2({}, normalSingleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
     }
   },
   30: {
@@ -24539,6 +24626,14 @@ var inputTypes = {
       props: _objectSpread2({
         treeCheckable: false
       }, normalSingleSelectProps)
+    },
+    360: {
+      type: 'bs-roleSelect',
+      props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
     }
   }
 };
@@ -24570,7 +24665,8 @@ var choiceType = Object.freeze({
   310: '配送方式选择器',
   330: '变量',
   340: '规则模板选择器',
-  350: '营销区域选择器'
+  350: '营销区域选择器',
+  360: '角色选择器'
 });
 var inputType = {
   10: '输入',
@@ -28681,6 +28777,120 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
+        // 角色选择器
+        if (dataChoiceBusinessType == 360) {
+          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+            return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.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.createElement("span", null, "~"), /*#__PURE__*/React.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.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
@@ -29829,18 +30039,18 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'or');
           }
-        }, "OR"), /*#__PURE__*/React.createElement("p", {
+        }, "\u6216\u8005"), /*#__PURE__*/React.createElement("p", {
           className: 'choose_logical_type',
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'and');
           }
-        }, "AND")),
+        }, "\u5E76\u4E14")),
         trigger: "focus"
       }, /*#__PURE__*/React.createElement(Button, {
         disabled: disabled,
         type: "link",
         className: 'logical_item_btn'
-      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? 'OR' : 'AND', /*#__PURE__*/React.createElement(DownOutlined, {
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? '或者' : '并且', /*#__PURE__*/React.createElement(DownOutlined, {
         style: {
           marginLeft: '6px'
         }

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: '输入',
@@ -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
@@ -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'
         }

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.27",
   "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: '输入',