@titaui/pc 1.7.17 → 1.7.21

package/src/components/select-tags/index.scss

@@ -1,77 +1,111 @@
-.rc-select-single:not(.rc-select-customize-input) .rc-select-selector {
-  border: 1px solid #DFE3EA;
-}
+.titaui-select {
+  .rc-select-single:not(.rc-select-customize-input) .rc-select-selector {
+    border: 1px solid #DFE3EA;
+  }
 
-.rc-select-focused{
-  .rc-select-selector{
-    border: 1px solid #DFE3EA !important;
+  .rc-select-focused {
+    .rc-select-selector {
+      border: 1px solid #DFE3EA !important;
+    }
   }
-}
-.rc-select-selection-item-remove{
-  display: flex;
-  align-items: center;
-}
-.rc-select-multiple .rc-select-selector .rc-select-selection-search-input {
-  display: none;
-}
 
-.rc-select-single:not(.rc-select-customize-input) .rc-select-selector .rc-select-selection-search-input{
-  display: none;
-}
+  .rc-select-selection-item-remove {
+    display: flex;
+    align-items: center;
+  }
 
-.rc-select-single .rc-select-selector .rc-select-selection-item, .rc-select-single .rc-select-selector .rc-select-selection-placeholder{
-  top: unset;
-  left: 12px;
-}
+  .rc-select-multiple .rc-select-selector .rc-select-selection-search-input {
+    display: none;
+  }
 
-.rc-select-single .rc-select-selector{
-  align-items: center;
-}
+  .rc-select-single:not(.rc-select-customize-input) .rc-select-selector .rc-select-selection-search-input {
+    display: none;
+  }
 
-.rc-select-selector{
-  cursor: pointer;
-  padding: 0 12px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  border: 1px solid #DFE3EA;
-  height: 36px;
-  box-sizing: border-box;
-}
-.rc-select-multiple .rc-select-selector {
-  height: unset;
-  padding: 7px 12px 0;
-  border: 1px solid #DFE3EA;
-}
-.rc-select-multiple .rc-select-selector .rc-select-selection-overflow-item {
-  display: flex;
-  align-items: center;
-  margin-bottom: 7px;
-}
+  .rc-select-single .rc-select-selector .rc-select-selection-item,
+  .rc-select-single .rc-select-selector .rc-select-selection-placeholder {
+    top: unset;
+    left: 12px;
+  }
 
-.rc-select-selection-item-content{
-  margin-right: 8px;
-}
+  .rc-select-single .rc-select-selector {
+    align-items: center;
+  }
 
-.rc-select-multiple .rc-select-selector .rc-select-selection-item {
-  font-size: 12px;
-  flex: none;
-  height: 20px;
-  display: flex;
-  align-items: center;
-  background: #F0F4FA;
-  border-radius: 10px;
-  margin-right: 2px;
-  padding: 0 5px 0 10px;
-  .tu-icon-cross{
+  .rc-select-selector {
     cursor: pointer;
-    color:#a4acB9;
-    font-size: 14px;
+    padding: 0 12px;
+    background: #FFFFFF;
+    border-radius: 8px;
+    border: 1px solid #DFE3EA;
+    height: 36px;
+    box-sizing: border-box;
+  }
+
+  .rc-select-multiple .rc-select-selector {
+    height: unset;
+    padding: 7px 12px 0;
+    border: 1px solid #DFE3EA;
+  }
+
+  .rc-select-multiple .rc-select-selector .rc-select-selection-overflow-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 7px;
+  }
+
+  .rc-select-multiple .rc-select-selector .rc-select-selection-placeholder {
+    line-height: 1;
+    margin-bottom: 7px;
+    position: relative;
+    top: -2px;
+  }
+
+  .rc-select-selection-item-content {
+    margin-right: 8px;
+  }
+
+  .rc-select-multiple .rc-select-selector .rc-select-selection-item {
+    font-size: 12px;
+    flex: none;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    background: #F0F4FA;
+    border-radius: 10px;
+    margin-right: 2px;
+    padding: 0 5px 0 10px;
+
+    .tu-icon-cross {
+      cursor: pointer;
+      color: #a4acB9;
+      font-size: 14px;
+    }
+  }
+
+  .titaui-select-noborder {
+    .rc-select-selector {
+      border: none !important;
+      height: 22px;
+      line-height: 1;
+    }
+  }
+
+  .rc-select-arrow {
+    font-size: 16px;
+    transform: scale(0.5);
+  }
+
+  .rc-select-show-arrow .rc-select-arrow {
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    right: 12px;
+    height: 22px;
   }
 }
-.rc-select-item {
-  font-size: 14px;
-}
-.rc-select-dropdown{
+
+.titaui-dropDown {
   z-index: 2000;
   box-sizing: border-box;
   padding: 16px 6px;
@@ -79,48 +113,43 @@
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #F0F2F5;
   border-radius: 8px;
-}
 
-.rc-select-item-option{
-  height: 36px;
-  line-height: 36px;
-  cursor: pointer;
-}
-.rc-select-item-option-selected {
+  .rc-select-item {
+    font-size: 14px;
+    padding: 7px 6px;
+  }
 
-  color: #2879FF;
-}
-.rc-select-item-option-active {
-  border-radius: 8px;
-  color: #2879FF;
-  background: #F7F8FA;
-}
+  .rc-select-item-option {
+    height: 36px;
+    box-sizing: border-box;
+    line-height: 36px;
+    cursor: pointer;
+  }
 
-.rc-select-arrow{
-  font-size: 16px;
-  transform: scale(0.5);
-}
-.rc-select-show-arrow .rc-select-arrow {
-  top: 0;
-  bottom: 0;
-  margin: auto;
-  right: 12px;
-  height: 22px;
-}
+  .rc-select-item-option-selected {
 
-.rc-select-item-option-state{
-  display: none;
-}
+    color: #2879FF;
+  }
 
-.titaui-select-hasSelectItem{
-  .rc-select-item-option-state{
-    display: block;
+  .rc-select-item-option-content {
+    line-height: 24px;
+  }
+
+  .rc-select-item-option-active {
+    border-radius: 8px;
+    color: #2879FF;
+    background: #F7F8FA;
+  }
+
+
+
+  .rc-select-item-option-state {
+    display: none;
   }
 }
-.titaui-select-noborder{
-  .rc-select-selector{
-    border: none !important;
-    height: 22px;
-    line-height: 1;
+
+.titaui-select-hasSelectItem {
+  .rc-select-item-option-state {
+    display: block;
   }
 }

package/src/components/select-tags/index.tsx

@@ -39,43 +39,43 @@ const SelectTags: FC<Props> = ({
 
   const [value, setValue] = useState(selected);
 
-  // useEffect(()=>{
-  //   if(!selected) return
-  //   setValue(selected)
-  // },[selected])
-
   const onhandleChange = (value, options) => {
     onChange && onChange(value, options,name);
     setValue(value);
   };
 
   return (
-    <Select
-      className={classNames(preCls, className,{[`${preCls}-noborder`]: noBorder},)}
-      dropdownClassName={classNames({
-        [`${preCls}-hasSelectItem`]: mode === "multiple",
-      })}
-      value={value}
-      style={style}
-      mode={mode}
-      optionFilterProp="children"
-      optionLabelProp="children"
-      placeholder={placeholder}
-      onChange={onhandleChange}
-      showArrow={true}
-      removeIcon={<span className="tu-icon-cross"></span>}
-      inputIcon={<span className="tu-icon-caret-down" />}
-      menuItemSelectedIcon={<span className="tu-icon-finished" />}
-      {...restProps}
-    >
-      {data.map((item, key) => {
-        return (
-          <Option key={key} value={item.value}>
-            {item.label}
-          </Option>
-        );
-      })}
-    </Select>
+    <div className={preCls}>
+      <Select
+        className={classNames(className,{[`${preCls}-noborder`]: noBorder},)}
+        dropdownClassName={classNames(
+          `titaui-dropDown`,
+        {
+          [`${preCls}-hasSelectItem`]: mode === "multiple",
+        })}
+        value={value}
+        style={style}
+        mode={mode}
+        optionFilterProp="children"
+        optionLabelProp="children"
+        placeholder={placeholder}
+        onChange={onhandleChange}
+        showArrow={true}
+        removeIcon={<span className="tu-icon-cross"></span>}
+        inputIcon={<span className="tu-icon-caret-down" />}
+        menuItemSelectedIcon={<span className="tu-icon-finished" />}
+        {...restProps}
+      >
+        {data.map((item, key) => {
+          return (
+            <Option key={key} value={item.value}>
+              {item.label}
+            </Option>
+          );
+        })}
+      </Select>
+    </div>
+
   );
 };
 

package/src/components/upvote/index.tsx

@@ -29,6 +29,16 @@ interface Props {
   handleRequest?: (type: number) => Promise<any>;
 }
 
+const getBackgroundImage = (type) => {
+  let selected = attitudeArr.find((a) => a.type == type);
+  if (selected) {
+    return {
+      backgroundImage: `url(${selected.img})`,
+    };
+  }
+  return {};
+};
+
 function UpvoteButton({
   type,
   count,
@@ -110,12 +120,7 @@ function UpvoteButton({
                 [buttonType]: buttonType && upvoteState.type == 0,
                 "feed-upvote-button": true,
               })}
-              style={{
-                backgroundImage: `url(${
-                  (attitudeArr.find((a) => a.type == upvoteState.type) || {})
-                    .img
-                })`,
-              }}
+              style={getBackgroundImage(upvoteState.type)}
             />
           )}
         </a>
@@ -156,9 +161,7 @@ export const UpvoteButtonForFeed = (props: Props) => {
                 "feed-upvote-button": true,
               })}
               style={{
-                backgroundImage: `url(${
-                  (attitudeArr.find((a) => a.type == type) || { img: "" }).img
-                })`,
+                ...getBackgroundImage(type),
                 marginRight: 4,
               }}
             />

package/src/index.js

@@ -77,8 +77,9 @@ export { default as LikeRankingPage } from "./pages/like-ranking";
 export { default as NewOkrListPage } from "./pages/new-okr-list";
 export { default as PersonalInfoPage } from "./pages/personal-info";
 export { default as ErrorBoundary } from "./components/error-boundary";
-export { ERROR_LEVEL } from "./utils/error-level";
+export { ERROR_LEVEL as ERROR_LEVEL } from "./utils/error-level";
 export { default as SelectTags } from "./components/select-tags";
 export { default as Cascader } from "./components/cascader";
 export { default as requestApi } from "./utils/request";
 export { default as PointDemo} from './components/point-demo'
+export { default as Scrollbar } from './components/scrollbar'

package/src/utils/bs-global.js

@@ -1,32 +1,22 @@
-import { BSGlobal } from "./mock-bsglobal";
 
 export const getUserInfo = () => {
-  if (window.location.host.indexOf("127.0.0.1") !== -1)
-    return BSGlobal.loginUserInfo;
   return window.BSGlobal && window.BSGlobal.loginUserInfo;
 };
 
 export const getTenantInfo = () => {
-  if (window.location.host.indexOf("127.0.0.1") !== -1)
-    return BSGlobal.tenantInfo;
   return window.BSGlobal && window.BSGlobal.tenantInfo;
 };
 
 export const getBSGlobal = (key) => {
-  if (window.location.host.indexOf("127.0.0.1") !== -1) return BSGlobal[key];
   return window.BSGlobal[key];
 };
 
 export const getOkrAdvancedSetting = () => {
-  if (window.location.host.indexOf("127.0.0.1") !== -1)
-    return BSGlobal["OkrAdvancedSetting"];
   return window.BSGlobal["OkrAdvancedSetting"];
 };
 
 export const getVersion = () => {
   // version 1 试用版
-  if (window.location.host.indexOf("127.0.0.1") !== -1)
-    return BSGlobal["tenantAuthentication"].Version;
   return window.BSGlobal["tenantAuthentication"].Version;
 };