ls-pro-common 3.0.37 → 3.0.38

package/es/components/TagCheck.d.ts

@@ -0,0 +1,15 @@
+import { CSSProperties } from 'react';
+declare const TagCheck: (props: {
+    value?: string | number | string[] | number[] | undefined;
+    onChange?: ((checkedValues: any, currentItem: any, checked: boolean) => void) | undefined;
+    className?: string | undefined;
+    tagClassName?: string | undefined;
+    style?: CSSProperties | undefined;
+    tagStyle?: CSSProperties | undefined;
+    options: {
+        value: number | string;
+        label: string;
+    }[];
+    multiple?: boolean | undefined;
+}) => JSX.Element;
+export default TagCheck;

package/es/components/TagCheck.js

@@ -0,0 +1,61 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/tag/style";
+import _Tag from "antd/es/tag";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from "react";
+import { useState, useEffect } from 'react';
+import classNames from 'classnames';
+var TagCheck = function TagCheck(props) {
+  var _onChange = props.onChange,
+    className = props.className,
+    style = props.style,
+    tagClassName = props.tagClassName,
+    tagStyle = props.tagStyle,
+    options = props.options,
+    _props$multiple = props.multiple,
+    multiple = _props$multiple === void 0 ? true : _props$multiple;
+  var _useState = useState(props.value === undefined ? [] : Array.isArray(props.value) ? props.value : [props.value]),
+    _useState2 = _slicedToArray(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  useEffect(function () {
+    if (!('value' in props)) return;
+    setInnerValue(props.value === undefined ? [] : Array.isArray(props.value) ? props.value : [props.value]);
+    console.log('value', props.value);
+  }, [props.value]);
+  return /*#__PURE__*/React.createElement("div", {
+    style: style,
+    className: classNames('tag-check', className)
+  }, multiple && options.length > 0 && /*#__PURE__*/React.createElement(_Tag.CheckableTag, {
+    checked: innerValue.length === options.length,
+    onChange: function onChange(checked) {
+      var val = checked ? options.map(function (o) {
+        return o.value;
+      }) : [];
+      setInnerValue(val);
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange(val.length ? val : undefined, 'all', checked);
+    }
+  }, "\u5168\u90E8"), options && options.map(function (item) {
+    return /*#__PURE__*/React.createElement(_Tag.CheckableTag, {
+      className: tagClassName,
+      style: tagStyle,
+      key: item.value,
+      checked: innerValue.filter(function (o) {
+        return item.value == o;
+      }).length > 0,
+      onChange: function onChange(checked) {
+        var val = [];
+        if (checked) {
+          val = multiple ? [].concat(_toConsumableArray(innerValue), [item.value]) : [item.value];
+        } else {
+          val = innerValue.filter(function (o) {
+            return o != item.value;
+          });
+        }
+        setInnerValue(val);
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(val.length ? multiple ? val : val[0] : undefined, item, checked);
+      }
+    }, item.label);
+  }));
+};
+export default TagCheck;

package/es/components/common.less

@@ -371,6 +371,39 @@ a:hover {
   }
 }
 
+.tag-check {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 5px;
+
+  .ant-tag-checkable {
+    background-color: #efefef;
+    border-color: #efefef;
+    margin-right: 0px;
+    position: relative;
+  }
+
+  .ant-tag-checkable-checked {
+    border-color: var(--ant-primary-color);
+    color: var(--ant-primary-color);
+    background-color: var(--ant-primary-1);
+
+    &::after {
+      content: '';
+      position: absolute;
+      width: 0;
+      height: 0;
+      right: 0;
+      bottom: 0;
+      border-width: 4px;
+      border-style: solid;
+      border-color: transparent;
+      border-right-color: var(--ant-primary-color);
+      border-bottom-color: var(--ant-primary-color);
+    }
+  }
+}
+
 .ant-pro-table-list-toolbar-title {
   .ls-group-tip {
     padding-bottom: 0;

package/es/http/index.js

@@ -42,7 +42,7 @@ request.interceptors.request.use(function (url, options) {
   }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var param = {
-    resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
+    resCode: getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()
   };
   if (!param.resCode) {

package/es/index.d.ts

@@ -15,6 +15,7 @@ import IconText from './components/IconText';
 import IconQuestion from './components/IconQuestion';
 import IconBell from './components/IconBell';
 import IconSearch from './components/IconSearch';
+import TagCheck from './components/TagCheck';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -29,4 +30,4 @@ import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/es/index.js

@@ -15,6 +15,7 @@ import IconText from './components/IconText';
 import IconQuestion from './components/IconQuestion';
 import IconBell from './components/IconBell';
 import IconSearch from './components/IconSearch';
+import TagCheck from './components/TagCheck';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -23,4 +24,4 @@ import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
 import useGetState from './hooks/useGetState';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/lib/components/TagCheck.d.ts

@@ -0,0 +1,15 @@
+import { CSSProperties } from 'react';
+declare const TagCheck: (props: {
+    value?: string | number | string[] | number[] | undefined;
+    onChange?: ((checkedValues: any, currentItem: any, checked: boolean) => void) | undefined;
+    className?: string | undefined;
+    tagClassName?: string | undefined;
+    style?: CSSProperties | undefined;
+    tagStyle?: CSSProperties | undefined;
+    options: {
+        value: number | string;
+        label: string;
+    }[];
+    multiple?: boolean | undefined;
+}) => JSX.Element;
+export default TagCheck;

package/lib/components/TagCheck.js

@@ -0,0 +1,61 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/tag/style";
+import _Tag from "antd/es/tag";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from "react";
+import { useState, useEffect } from 'react';
+import classNames from 'classnames';
+var TagCheck = function TagCheck(props) {
+  var _onChange = props.onChange,
+    className = props.className,
+    style = props.style,
+    tagClassName = props.tagClassName,
+    tagStyle = props.tagStyle,
+    options = props.options,
+    _props$multiple = props.multiple,
+    multiple = _props$multiple === void 0 ? true : _props$multiple;
+  var _useState = useState(props.value === undefined ? [] : Array.isArray(props.value) ? props.value : [props.value]),
+    _useState2 = _slicedToArray(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  useEffect(function () {
+    if (!('value' in props)) return;
+    setInnerValue(props.value === undefined ? [] : Array.isArray(props.value) ? props.value : [props.value]);
+    console.log('value', props.value);
+  }, [props.value]);
+  return /*#__PURE__*/React.createElement("div", {
+    style: style,
+    className: classNames('tag-check', className)
+  }, multiple && options.length > 0 && /*#__PURE__*/React.createElement(_Tag.CheckableTag, {
+    checked: innerValue.length === options.length,
+    onChange: function onChange(checked) {
+      var val = checked ? options.map(function (o) {
+        return o.value;
+      }) : [];
+      setInnerValue(val);
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange(val.length ? val : undefined, 'all', checked);
+    }
+  }, "\u5168\u90E8"), options && options.map(function (item) {
+    return /*#__PURE__*/React.createElement(_Tag.CheckableTag, {
+      className: tagClassName,
+      style: tagStyle,
+      key: item.value,
+      checked: innerValue.filter(function (o) {
+        return item.value == o;
+      }).length > 0,
+      onChange: function onChange(checked) {
+        var val = [];
+        if (checked) {
+          val = multiple ? [].concat(_toConsumableArray(innerValue), [item.value]) : [item.value];
+        } else {
+          val = innerValue.filter(function (o) {
+            return o != item.value;
+          });
+        }
+        setInnerValue(val);
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(val.length ? multiple ? val : val[0] : undefined, item, checked);
+      }
+    }, item.label);
+  }));
+};
+export default TagCheck;

package/lib/components/common.less

@@ -371,6 +371,39 @@ a:hover {
   }
 }
 
+.tag-check {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 5px;
+
+  .ant-tag-checkable {
+    background-color: #efefef;
+    border-color: #efefef;
+    margin-right: 0px;
+    position: relative;
+  }
+
+  .ant-tag-checkable-checked {
+    border-color: var(--ant-primary-color);
+    color: var(--ant-primary-color);
+    background-color: var(--ant-primary-1);
+
+    &::after {
+      content: '';
+      position: absolute;
+      width: 0;
+      height: 0;
+      right: 0;
+      bottom: 0;
+      border-width: 4px;
+      border-style: solid;
+      border-color: transparent;
+      border-right-color: var(--ant-primary-color);
+      border-bottom-color: var(--ant-primary-color);
+    }
+  }
+}
+
 .ant-pro-table-list-toolbar-title {
   .ls-group-tip {
     padding-bottom: 0;

package/lib/http/index.js

@@ -42,7 +42,7 @@ request.interceptors.request.use(function (url, options) {
   }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var param = {
-    resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
+    resCode: getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()
   };
   if (!param.resCode) {

package/lib/index.d.ts

@@ -15,6 +15,7 @@ import IconText from './components/IconText';
 import IconQuestion from './components/IconQuestion';
 import IconBell from './components/IconBell';
 import IconSearch from './components/IconSearch';
+import TagCheck from './components/TagCheck';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -29,4 +30,4 @@ import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/lib/index.js

@@ -15,6 +15,7 @@ import IconText from './components/IconText';
 import IconQuestion from './components/IconQuestion';
 import IconBell from './components/IconBell';
 import IconSearch from './components/IconSearch';
+import TagCheck from './components/TagCheck';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -23,4 +24,4 @@ import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
 import useGetState from './hooks/useGetState';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.37",
+  "version": "3.0.38",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [