@zgfe/business-lib 1.0.8 → 1.0.11

package/es/assets/styles/resetAntd.less

@@ -5,6 +5,7 @@
 // 输入框（带icon)
 .ant-input-affix-wrapper {
   height: @height-lg;
+  padding: 0 @padding-xs;
   line-height: @height-lg;
   background-color: @background-color-base;
   border-color: #fff;
@@ -17,6 +18,11 @@
   &:hover {
     border-color: @primary-color;
   }
+
+  &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper,
+  &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper:hover {
+    background-color: @background-color-base;
+  }
 }
 
 .ant-input-affix-wrapper-focused {
@@ -42,28 +48,10 @@
 }
 
 .ant-input-group-addon {
+  color: @text-color-secondary;
   background-color: @background-color-base;
 }
 
-.ant-btn-default {
-  border-radius: 4px;
-
-  &:hover,
-  &:active,
-  &:focus {
-    .__default-hover();
-  }
-}
-
-.ant-btn-primary {
-  border-radius: @border-radius-small;
-}
-
-.ant-btn-sm {
-  padding: 0 5px;
-  font-size: 12px;
-}
-
 .ant-select-dropdown {
   .__select-panel();
 }
@@ -71,7 +59,7 @@
 // 选择框下拉选项
 .ant-select-item {
   height: @height-lg;
-  padding: 10px 8px;
+  padding: 0 @padding-sm;
   border-radius: @border-radius-normal;
 
   &:hover:not(.ant-select-item-option-disabled, .ant-select-item-option-selected) {
@@ -130,6 +118,14 @@
 .ant-picker {
   border-radius: @border-radius-small;
 
+  span {
+    color: @text-color-secondary;
+  }
+
+  .ant-picker-input > input {
+    color: @text-color;
+  }
+
   &:hover,
   &.ant-picker-focused {
     .__default-hover();
@@ -376,6 +372,10 @@
       }
     }
 
+    .ant-table-tbody {
+      color: @text-color-secondary;
+    }
+
     .ant-table-tbody > tr:not(:last-child) > td {
       border-bottom: 1px solid @border-color-base;
     }
@@ -396,3 +396,44 @@
     background: @primary-1;
   }
 }
+
+/* 提示框 */
+.ant-tooltip-inner {
+  padding: @padding-sm @padding-md;
+  border-radius: @border-radius-normal;
+}
+
+.ant-form-item-label > label {
+  color: @text-color-secondary;
+}
+
+.ant-btn {
+  border-radius: @border-radius-small;
+}
+
+.ant-btn-text {
+  background-color: @background-color-gray;
+  border: none;
+
+  &:hover {
+    color: @text-color;
+    background-color: @btn-text-hover-bg;
+  }
+
+  &:focus {
+    color: @text-color;
+    background-color: #94a6ce;
+  }
+}
+
+.ant-btn-primary {
+  color: #fff;
+}
+
+.ant-btn-ghost {
+  color: @text-color-secondary;
+}
+
+.ant-form-item-explain-error {
+  color: @error-color;
+}

package/es/assets/styles/variable.less

@@ -2,7 +2,7 @@
 
 @border-radius-sx: 2px;
 @border-radius-small: 4px;
-@border-radius-normal: 10px;
+@border-radius-normal: 8px;
 @border-radius-large: 20px;
 @option-height: @height-lg;
 @background-color-base: #fafafb;
@@ -19,3 +19,10 @@
 @text-color: #021429;
 // 次要
 @text-color-secondary: #5f6085;
+// 中性色/重要-文标题2
+@tooltip-bg: #242541;
+// 错误颜色
+@error-color: #fb5547;
+
+// text-btn hover背景色
+@btn-text-hover-bg: #cacdd4;

package/es/assets/theme.d.ts

@@ -1,5 +1,8 @@
 declare const _default: {
     'primary-color': string;
     'border-color-base': string;
+    'primary-1': string;
+    'text-color': string;
+    'text-color-secondary': string;
 };
 export default _default;

package/es/assets/theme.js

@@ -1,4 +1,7 @@
 export default {
   'primary-color': '#165dff',
-  'border-color-base': '#ECEDF0'
+  'border-color-base': '#ECEDF0',
+  'primary-1': '#E8EFFF',
+  'text-color': '#021429',
+  'text-color-secondary': '#5f6085'
 };

package/es/attrConditions/components/stringList.js

@@ -17,9 +17,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { classPrefix } from '..';
 import { PropCategory } from '../../attributeSelector/types';
+import Apis from '../../constants/apis';
 import BizGlobalDataContext from '../../context';
 import BizSelect from '../../select';
-import { ajax } from '../../utils';
+import request from '../../utils/ajax';
 import { OperateTypes } from '../types';
 
 var StringList = function StringList(props) {
@@ -99,8 +100,8 @@ var StringList = function StringList(props) {
               };
 
               formData = transformRequest(requestData);
-              ajax({
-                url: '/data/queryEsData.jsp',
+              request(Apis.esQuery, {
+                method: 'post',
                 data: formData,
                 headers: {
                   'Content-Type': 'application/x-www-form-urlencoded'

package/es/attributeSelector/demo/index.js

@@ -51,7 +51,7 @@ export default (function () {
     enableDelete: true,
     disableItemList: [{
       propCategory: 'eventProp',
-      id: 30183424
+      id: 30183426
     }, {
       name: 'is_anonymous',
       propCategory: 'userProp'

package/es/attributeSelector/index.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import './styles/index.less';
 import { Dropdown, Tooltip } from 'antd';
 import AttrListPanel from './listPanel';
@@ -49,7 +49,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       userPropList = _useContext.userPropList,
       eventEnvList = _useContext.eventEnvList;
 
+  var boxRef = useRef(null);
+
+  var _useState7 = useState(200),
+      _useState8 = _slicedToArray(_useState7, 2),
+      width = _useState8[0],
+      setWidth = _useState8[1];
+
   useEffect(function () {
+    setWidth(boxRef.current.width || 284);
     if (!props.defaultValue) return;
     setCurrentAttr(getValue(props.defaultValue));
   }, []);
@@ -108,7 +116,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     })),
     trigger: ['click'],
     overlayStyle: {
-      minWidth: 0
+      minWidth: 284,
+      width: width
     },
     visible: visible,
     onVisibleChange: onVisibleChange
@@ -117,6 +126,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       width: '100%'
     }
   }, /*#__PURE__*/React.createElement(SelectHandle, {
+    ref: boxRef,
     theme: "secondary",
     border: false,
     label: currentAttr === null || currentAttr === void 0 ? void 0 : currentAttr.label,

package/es/attributeSelector/styles/index.less

@@ -12,15 +12,16 @@
     display: none;
     flex: none;
     width: @icon-width;
+    color: @text-color-secondary;
     line-height: 2em;
     text-align: center;
     border-radius: @border-radius-small;
+
     &:hover {
       .__error-hover();
     }
   }
   &-drowdown {
-    width: 284px;
     .__select-panel();
     &.nodata {
       .__select-nodata();

package/es/chart/demo/index.js

@@ -1,10 +1,42 @@
-import React from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useRef, useState } from 'react';
 import { BizChart } from '@zgfe/business-lib';
 import chartData from './data/data';
+import { Button, Image } from 'antd';
 export default (function () {
-  return /*#__PURE__*/React.createElement(BizChart, {
+  var chartRef = useRef();
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      chartImg = _useState2[0],
+      setChartImg = _useState2[1];
+
+  var onClick = function onClick() {
+    var url = chartRef.current.instance.getDataURL();
+    setChartImg(url);
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
     type: "line",
-    legendPosition: "bottom"
-  });
+    legendPosition: "bottom",
+    ref: chartRef
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
+    onClick: onClick
+  }, "\u83B7\u53D6\u56FE\u8868\u56FE\u7247"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Image, {
+    src: chartImg,
+    width: "100%",
+    height: 300
+  }));
 });

package/es/chart/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './util/data/china.js';
 import { ChartTypes } from './types';
-declare const BizChart: React.FC<ChartTypes.Props>;
+declare const BizChart: React.ForwardRefExoticComponent<ChartTypes.Props & React.RefAttributes<any>>;
 export default BizChart;

package/es/chart/index.js

@@ -16,15 +16,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useState } from 'react';
 import ReactEChartsCore from 'echarts-for-react/lib/core';
 import * as echarts from 'echarts';
 import { getChartOption, getPieOption, getMapOption } from './util/chartOptionConfig';
 import { provinceSeries, citySeries, maxMinValue } from './util/mapUtil';
 import { formatPieData, formatChartData } from './util/formatData';
 import './util/data/china.js';
-
-var BizChart = function BizChart(props) {
+var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var type = props.type,
       data = props.data,
       showList = props.showList,
@@ -50,6 +49,11 @@ var BizChart = function BizChart(props) {
       chartOption = _useState2[0],
       setChartOption = _useState2[1];
 
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      instance = _useState4[0],
+      setInstance = _useState4[1];
+
   useEffect(function () {
     if (option) {
       setChartOption(function () {
@@ -82,7 +86,15 @@ var BizChart = function BizChart(props) {
       return _objectSpread({}, eOption);
     });
   }, [data, showAll, showList, reverseXAxis]);
+  useImperativeHandle(ref, function () {
+    return {
+      instance: instance
+    };
+  });
   return /*#__PURE__*/React.createElement(ReactEChartsCore, {
+    ref: function ref(e) {
+      setInstance(e === null || e === void 0 ? void 0 : e.getEchartsInstance());
+    },
     echarts: echarts,
     option: chartOption,
     notMerge: true,
@@ -92,8 +104,7 @@ var BizChart = function BizChart(props) {
       width: '100%'
     }
   });
-};
-
+});
 BizChart.defaultProps = {
   showAll: false,
   reverseXAxis: false,

package/es/config.d.ts

@@ -0,0 +1,15 @@
+import { RequestOptionsInit } from 'umi-request';
+import { ApiResult } from './utils/ajax';
+export interface RequestConfig {
+    optionsWrapper?: (url: string, options?: RequestOptionsInit) => {
+        url: string;
+        options?: RequestOptionsInit;
+    };
+    responseWrapper?: (url: string, apiResult: ApiResult<any>) => ApiResult<any>;
+}
+export interface GlobalConfig {
+    request?: RequestConfig;
+}
+export declare let globalConfig: GlobalConfig;
+declare function setGlobalConfig(config: GlobalConfig): void;
+export default setGlobalConfig;

package/es/config.js

@@ -0,0 +1,8 @@
+import _ from 'lodash';
+export var globalConfig = {};
+
+function setGlobalConfig(config) {
+  globalConfig = _.assignIn(config, globalConfig);
+}
+
+export default setGlobalConfig;

package/es/constants/apis.d.ts

@@ -0,0 +1,8 @@
+declare const Apis: {
+    querySceneGroup: string;
+    addScene: string;
+    esQuery: string;
+    addPanel: string;
+    queryPanelGroup: string;
+};
+export default Apis;

package/es/constants/apis.js

@@ -0,0 +1,8 @@
+var Apis = {
+  querySceneGroup: '/scene/queryScenesOfGroup.jsp',
+  addScene: '/scene/addScene.jsp',
+  esQuery: '/data/queryEsData.jsp',
+  addPanel: '/apppanel/addPanelElement.jsp',
+  queryPanelGroup: '/apppanel/panels.jsp'
+};
+export default Apis;

package/es/datePicker/styles/index.less

@@ -1,4 +1,5 @@
 @import '../../assets/styles/inner.less';
+
 .biz-date-picker {
   display: flex;
 
@@ -10,15 +11,18 @@
     display: flex;
     margin: 0 16px;
   }
+
   .biz-select-handle {
     padding: 0;
   }
+
   &-item {
     display: flex;
     align-items: center;
     justify-content: center;
     width: 58px;
     height: @height-base;
+    color: @text-color-secondary;
     border: 1px solid @border-color-base;
     cursor: pointer;
 

package/es/dialog/demo/index.d.ts

@@ -1,31 +1,2 @@
-export declare const chartTypes: ({
-    label: string;
-    value: string;
-    icon: string;
-    disabled?: undefined;
-    children?: undefined;
-} | {
-    label: string;
-    value: string;
-    icon: string;
-    disabled: boolean;
-    children?: undefined;
-} | {
-    label: string;
-    value: string;
-    icon: string;
-    children: ({
-        label: string;
-        value: string;
-        icon: string;
-        disabled?: undefined;
-    } | {
-        label: string;
-        value: string;
-        icon: string;
-        disabled: boolean;
-    })[];
-    disabled?: undefined;
-})[];
 declare const _default: () => JSX.Element;
 export default _default;

package/es/dialog/demo/index.js

@@ -1,9 +1,3 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -19,143 +13,25 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { BizDialog } from '@zgfe/business-lib';
 import { Button } from 'antd';
-var options = [{
-  id: 11,
-  name: '分类一'
-}, {
-  id: 22,
-  name: '分类二'
-}, {
-  id: 33,
-  name: '分分类三一'
-}];
-export var chartTypes = [{
-  label: '趋势图',
-  value: 'line',
-  icon: 'qushitu1'
-}, {
-  label: '汇总图',
-  value: 'bar',
-  icon: 'huizongtu'
-}, {
-  label: '地图',
-  value: 'map',
-  icon: 'ditu',
-  disabled: true
-}, {
-  label: '表格',
-  value: 'table',
-  icon: 'biaoge',
-  children: [{
-    label: '趋势图',
-    value: 'line',
-    icon: 'qushitu1'
-  }, {
-    label: '汇总图',
-    value: 'bar',
-    icon: 'huizongtu',
-    disabled: true
-  }]
-}, {
-  label: '分数',
-  value: 'fraction',
-  icon: 'fenshu'
-}];
-var fields = [{
-  label: '分类',
-  name: 'class',
-  extendName: 'range',
-  type: 'selectToInput',
-  options: options,
-  children: ['range'],
-  fieldNames: {
-    label: 'name',
-    value: 'id'
-  },
-  rules: [{
-    required: true,
-    message: '请选择分类'
-  }],
-  onChange: function onChange(val) {
-    console.log('value>>>', val);
-  }
-}, {
-  label: '名称',
-  name: 'name',
-  type: 'input',
-  rules: [{
-    required: true,
-    message: '请输入名称'
-  }]
-}, {
-  label: '图表',
-  name: 'chart',
-  type: 'tab',
-  options: chartTypes,
-  rules: [{
-    required: true,
-    message: '请选择图表'
-  }]
-}, {
-  label: '显示',
-  name: 'show',
-  type: 'radio',
-  direction: 'vertical',
-  dependenceFields: {
-    chart: 'line'
-  },
-  options: [{
-    label: '动态显示数据最多的10个分组',
-    value: 'dynamic'
-  }, {
-    label: '固定显示当前选择的分组',
-    value: 'fix'
-  }],
-  rules: [{
-    required: true,
-    message: '请选择'
-  }]
-}];
-var formData = {
-  class: {
-    id: 11,
-    name: '分类一'
-  },
-  range: 'public',
-  show: 'dynamic',
-  chart: 'line'
-};
 export default (function () {
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var _useState3 = useState(),
-      _useState4 = _slicedToArray(_useState3, 2),
-      dialogData = _useState4[0],
-      setDialogData = _useState4[1];
-
-  var handleSubmit = function handleSubmit(data) {
-    setDialogData(function () {
-      return _objectSpread({}, data);
-    });
-    setVisible(false);
-  };
-
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       setVisible(true);
     }
-  }, "\u5411\u770B\u677F\u6DFB\u52A0\u6307\u6807"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, JSON.stringify(dialogData)), /*#__PURE__*/React.createElement(BizDialog, {
-    title: "\u5411\u770B\u677F\u6DFB\u52A0\u6307\u6807",
+  }, "\u6253\u5F00\u5F39\u7A97"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizDialog, {
+    title: "\u6807\u9898",
     visible: visible,
-    onOk: handleSubmit,
-    fields: fields,
-    initialValues: formData,
+    onOk: function onOk() {
+      setVisible(false);
+    },
     onCancel: function onCancel() {
       setVisible(false);
     }
-  }));
+  }, "fdfdfdsa"));
 });

package/es/dialog/index.d.ts

@@ -1,7 +1,6 @@
-import { FormItemProps, ModalProps } from 'antd';
 import React from 'react';
 import { DialogTypes } from './types';
 import './styles/index.less';
 export declare const classPrefix = "biz-dialog";
-declare const BizDialog: React.FC<ModalProps & DialogTypes.Props & FormItemProps>;
+declare const BizDialog: React.FC<DialogTypes.Props>;
 export default BizDialog;