@zgfe/business-lib 1.1.41-attribution.14 → 1.1.41-attribution.16

package/es/addToPanel/components/styleList.js

@@ -61,7 +61,7 @@ var StyleList = function StyleList(props) {
         return ChildList(item);
       }
     }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-item").concat(item.disabled ? ' disabled' : '', " ").concat(tab && tab[0] === item.value ? 'active' : ''),
+      className: "".concat(classPrefix, "-item").concat(item.disabled ? ' disabled' : '', " ").concat(tab && tab[0] === item.value ? 'active' : '', "  ").concat(props.options && props.options.length === 1 ? 'one' : ''),
       onClick: function onClick() {
         return _onClick(item);
       }

package/es/addToPanel/index.js

@@ -184,6 +184,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u770B\u677F",
     name: "panel",
+    colon: false,
     hidden: props.type === 'edit',
     rules: [{
       validator: function validator(_, value) {
@@ -212,6 +213,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u540D\u79F0",
     name: "name",
+    colon: false,
     hidden: props.type === 'edit',
     rules: [{
       validator: function validator(_, value) {
@@ -234,6 +236,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6837\u5F0F",
     name: "chartType",
+    colon: false,
     rules: [{
       required: true,
       message: '请选择样式'
@@ -249,6 +252,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     return type === 'line' || type === 'bar' ? /*#__PURE__*/React.createElement(Form.Item, {
       label: "\u663E\u793A",
       name: "showList",
+      colon: false,
       rules: [{
         required: true,
         message: '请选择显示'

package/es/addToPanel/styles/style.less

@@ -41,6 +41,12 @@
     }
   }
 
+  &-item.one {
+    &:last-child {
+      border-radius: @border-radius-small;
+    }
+  }
+
   &-icon {
     margin-right: 7px;
     font-size: 18px;

package/es/addToScene/index.js

@@ -119,6 +119,7 @@ var BizAddToScene = function BizAddToScene(props) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u573A\u666F\u5206\u7C7B",
     name: "group",
+    colon: false,
     rules: [{
       validator: function validator(_, value) {
         if (!value || !/\S+/.test(value.groupName)) return Promise.reject("\u8BF7".concat(addMode ? '输入' : '选择', "\u573A\u666F\u5206\u7C7B!"));
@@ -145,6 +146,7 @@ var BizAddToScene = function BizAddToScene(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u573A\u666F\u540D\u79F0",
     name: "name",
+    colon: false,
     rules: [{
       validator: function validator(_, value) {
         if (!value || !/\S+/.test(value)) return Promise.reject('请输入场景名称!');

package/es/attrCondition/group.js

@@ -31,7 +31,7 @@ var BizAttrConditionGroup = function BizAttrConditionGroup(props, ref) {
     className: "".concat(classPrefix, "-operate"),
     onClick: onClickRelation
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '')
+    className: "".concat(classPrefix, "-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '', " ").concat(props.onlyAnd ? 'only-and' : '')
   }, "\u4E14"), !props.onlyAnd && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-operate-text ").concat(relation === 'or' ? 'active' : '')
   }, "\u6216"))), /*#__PURE__*/React.createElement(Space, {

package/es/attrCondition/styles/index.less

@@ -59,5 +59,8 @@
         background: @primary-color;
       }
     }
+    &-operate-text.only-and {
+      border-radius: 2px;
+    }
   }
 }

package/es/attrConditions/components/operateList.js

@@ -5,6 +5,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
+import { message } from 'antd';
 import { classPrefix } from '..';
 import { PropType } from '../../attributeSelector/types';
 import BizSelect from '../../select';
@@ -50,12 +51,16 @@ var BizOperateList = function BizOperateList(props) {
     if (props.onChange) props.onChange(data.value);
   };
   if (!props.attr || !current || !options.length) {
-    return /*#__PURE__*/React.createElement(BizSelect, {
+    return /*#__PURE__*/React.createElement("div", {
+      onClick: function onClick() {
+        return message.error('请先选择属性');
+      }
+    }, /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-single-select"),
       theme: props.theme,
       disable: true,
       options: []
-    });
+    }));
   }
   return /*#__PURE__*/React.createElement(BizSelect, {
     disable: !props.attr,

package/es/attrConditions/components/valuesList.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { DatePicker, Input } from 'antd';
+import { DatePicker, Input, message } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import moment from 'moment';
 import React, { useEffect, useState } from 'react';
@@ -94,14 +94,18 @@ var ValuesList = function ValuesList(props) {
     return current && current > moment().endOf('day');
   };
   if (!attr || !operate || isFirst) {
-    return /*#__PURE__*/React.createElement(BizSelect, {
+    return /*#__PURE__*/React.createElement("div", {
+      onClick: function onClick() {
+        return message.error('请先选择属性');
+      }
+    }, /*#__PURE__*/React.createElement(BizSelect, {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),
       theme: theme,
       size: "middle",
       options: [],
       placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027\u503C"
-    });
+    }));
   }
   if (attr.type === PropType.STRING) {
     return /*#__PURE__*/React.createElement(StringList, {

package/es/select/option.js

@@ -82,7 +82,7 @@ var SelectOption = function SelectOption(props) {
     }), /*#__PURE__*/React.createElement("span", null, group.name));
   }
   return /*#__PURE__*/React.createElement(Tooltip, {
-    placement: "rightBottom",
+    placement: "right",
     title: isOverflow ? option[props.labelField] : null,
     zIndex: 100000
   }, /*#__PURE__*/React.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.41-attribution.14",
+  "version": "1.1.41-attribution.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5eb50ea04cf98e0c70f356cc9dfc0f25d6c6460e"
+  "gitHead": "f3c1ad8ece869422845327fba1fa0b397a91eb51"
 }