dtable-ui-component 4.3.10-alpha2 → 4.3.10-alpha4

package/lib/CollaboratorEditor/index.css

@@ -14,7 +14,6 @@
   min-height: 160px;
   max-height: 200px;
   margin: 10px 0;
-  padding: 0 10px;
   overflow: auto;
 }
 
@@ -23,7 +22,7 @@
   align-items: center;
   justify-content: space-between;
   height: 30px;
-  padding-left: 12px;
+  padding: 0 10px;
   font-size: 14px;
   cursor: pointer;
 }
@@ -45,3 +44,22 @@
   font-size: 12px;
   color: #798d99;
 }
+
+.dtable-ui-collaborator-editor .dtable-ui-collaborator-editor-container-no-btn {
+  min-height: 40px;
+  padding: 0.375rem 0.75rem;
+  border: 1px solid rgba(0, 40, 100, 0.12);
+  border-radius: 3px;
+  transition: border-color .15s ease-in-out;
+}
+
+.dtable-ui-collaborator-editor .dtable-ui-collaborator-editor-container-no-btn .collaborators-container {
+  min-height: 26px;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.dtable-ui-collaborator-editor .dtable-ui-collaborator-editor-container-no-btn .collaborators-container .collaborator-item {
+  margin: 2px 10px 2px 0;
+}

package/lib/CollaboratorEditor/index.js

@@ -9,7 +9,7 @@ import './index.css';
 class CollaboratorEditor extends React.Component {
   constructor(props) {
     super(props);
-    this.onDocumentToggle = e => {
+    this.onDocumentClick = e => {
       if (this.editorContainer !== e.target && !this.editorContainer.contains(e.target)) {
         this.onClosePopover();
       }
@@ -28,7 +28,7 @@ class CollaboratorEditor extends React.Component {
       }
       return [];
     };
-    this.onAddOptionToggle = event => {
+    this.togglePopover = event => {
       event.nativeEvent.stopImmediatePropagation();
       event.stopPropagation();
       if (this.props.isReadOnly) {
@@ -67,7 +67,6 @@ class CollaboratorEditor extends React.Component {
         newValue
       }, () => {
         this.onCommit(newValue);
-        this.onClosePopover();
       });
     };
     this.onDeleteCollaborator = collaborator => {
@@ -108,6 +107,15 @@ class CollaboratorEditor extends React.Component {
         isPopoverShow: false
       });
     };
+    this.onClickContainer = e => {
+      e.stopPropagation();
+      if (!this.props.isShowEditButton && !this.state.isPopoverShow) {
+        this.setState({
+          isPopoverShow: true,
+          popoverPosition: this.caculatePopoverPosition()
+        });
+      }
+    };
     this.setEditorContainerRef = editorContainer => {
       this.editorContainer = editorContainer;
     };
@@ -121,15 +129,16 @@ class CollaboratorEditor extends React.Component {
     };
   }
   componentDidMount() {
-    document.addEventListener('click', this.onDocumentToggle);
+    document.addEventListener('click', this.onDocumentClick);
   }
   componentWillUnmount() {
-    document.removeEventListener('click', this.onDocumentToggle);
+    document.removeEventListener('click', this.onDocumentClick);
   }
   render() {
     let {
       collaborators,
-      isReadOnly
+      isReadOnly,
+      isShowEditButton
     } = this.props;
     let {
       isPopoverShow,
@@ -142,12 +151,13 @@ class CollaboratorEditor extends React.Component {
       className: "dtable-ui-collaborator-editor"
     }, /*#__PURE__*/React.createElement("div", {
       ref: this.setEditorRef,
-      className: "dtable-ui-collaborator-editor-container"
-    }, /*#__PURE__*/React.createElement(EditEditorButton, {
+      className: "dtable-ui-collaborator-editor-container ".concat(isShowEditButton ? '' : 'dtable-ui-collaborator-editor-container-no-btn'),
+      onClick: this.onClickContainer
+    }, isShowEditButton && /*#__PURE__*/React.createElement(EditEditorButton, {
       text: getLocale('Add_a_collaborator'),
-      onClick: this.onAddOptionToggle
+      onClick: this.togglePopover
     }), selectedCollaborators.length > 0 && /*#__PURE__*/React.createElement("div", {
-      className: "collaborators-container mt-2"
+      className: "collaborators-container ".concat(isShowEditButton ? 'mt-2' : '')
     }, selectedCollaborators.map(collaborator => {
       return /*#__PURE__*/React.createElement(CollaboratorItem, {
         key: collaborator.email,
@@ -176,6 +186,7 @@ class CollaboratorEditor extends React.Component {
   }
 }
 CollaboratorEditor.defaultProps = {
+  isShowEditButton: true,
   isReadOnly: false,
   value: []
 };

package/lib/DateEditor/index.js

@@ -86,7 +86,6 @@ class DateEditor extends React.Component {
       lang,
       column
     } = this.props;
-    console.log('date editor 98', lang);
     let {
       newValue,
       isPopoverShow,

package/lib/DateEditor/pc-date-editor-popover.js

@@ -50,7 +50,6 @@ class PCDateEditorPopover extends React.Component {
         lang
       } = this.props;
       let defaultValue = dayjs().clone();
-      console.log('pc date editor', 67, getLocale('Please_input'));
       return /*#__PURE__*/React.createElement(Calendar, {
         locale: initDateEditorLanguage(lang),
         style: {

package/lib/lang/index.js

@@ -14,13 +14,11 @@ export function setLocale(args) {
   let lang = typeof args === 'string' ? args : LANGUAGE;
   LANGUAGE_MAP = langData[lang] || langData[LANGUAGE];
 }
-console.log(22, LANGUAGE_MAP);
 export function getLocale(key, def) {
   if (!key) return def;
   if (!LANGUAGE_MAP[key]) {
     return def || key;
   }
-  console.log(LANGUAGE_MAP[key]);
   return LANGUAGE_MAP[key];
 }
 export function substitute(str, obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "4.3.10-alpha2",
+  "version": "4.3.10-alpha4",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "2.0.5",