@zgfe/business-lib 1.2.55-ljy.2 → 1.2.55-plat.0

package/es/addToPanel/components/styleList.js

@@ -36,7 +36,7 @@ var StyleList = function StyleList(props) {
     }))));
   };
   var onChange = function onChange(data, child) {
-    setTab([child.value, data.value]);
+    setTab([data.value, child.value]);
     props.onChange && props.onChange("".concat(child.value, ",").concat(data.value));
   };
   var _onClick = function onClick(data) {

package/es/addToPanel/index.js

@@ -216,7 +216,6 @@ var BizAddToPanel = function BizAddToPanel(props) {
         options: props.styleOptions
       }));
     }
-    if (props.showOptions && props.showOptions.length == 0) return;
     if (showTypes.indexOf(type) > -1) {
       return /*#__PURE__*/React.createElement(Form.Item, {
         label: "\u663E\u793A",

package/es/constants/apis.d.ts

@@ -26,5 +26,6 @@ declare const Apis: {
     queryPanels: string;
     queryMetaDatasetList: string;
     queryDatasetTableNames: string;
+    queryPlatformList: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -25,6 +25,7 @@ var Apis = {
   querySubjectList: '/zg/web/v2/analysisSubject/queryAllSubject',
   queryPanels: '/zg/web/v2/apppanel/panels',
   queryMetaDatasetList: '/zg/web/v2/meta/dataset/list',
-  queryDatasetTableNames: '/zg/web/cdp/dataset/manager/datasetList'
+  queryDatasetTableNames: '/zg/web/cdp/dataset/manager/datasetList',
+  queryPlatformList: '/zg/web/v2/data/dynamicPlatformByAppid'
 };
 export default Apis;

package/es/platformSelector/index.js

@@ -4,16 +4,25 @@ 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 React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import { BizSelect } from '@zgfe/business-lib';
-import { platformOption } from './util';
 import './styles/index.less';
+import request from '../utils/ajax';
+import Apis from '../constants/apis';
+import BizGlobalDataContext from '../context';
+import { platformOptionUtil } from './util';
 var BizPlatformSelector = function BizPlatformSelector(props) {
   var classPrefix = 'biz-platform-selector';
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentValue = _useState2[0],
     setCurrentValue = _useState2[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    platformOption = _useState4[0],
+    setPlatformOption = _useState4[1];
   useEffect(function () {
     if (props.value) {
       var selectValue = platformOption.find(function (item) {
@@ -22,6 +31,33 @@ var BizPlatformSelector = function BizPlatformSelector(props) {
       setCurrentValue(selectValue || platformOption[0]);
     }
   }, [props.value]);
+  useEffect(function () {
+    queryPlatformList();
+  }, []);
+  function queryPlatformList() {
+    request(Apis.queryPlatformList, {
+      method: 'get',
+      params: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      var _res$data;
+      res.data;
+      if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
+        var list = res.data.map(function (item) {
+          return item.sdkPlatform;
+        });
+        var options = platformOptionUtil.map(function (item) {
+          if (list.includes(item.key) || item.key === 0) {
+            return item;
+          }
+        }).filter(function (item) {
+          return item;
+        });
+        setPlatformOption(options || []);
+      }
+    });
+  }
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(BizSelect, {

package/es/platformSelector/styles/index.less

@@ -8,6 +8,10 @@
     .biz-select-handle-content .biz-select-handle-icon .bsicon {
       color: #9aa1a9;
     }
+    .biz-select-handle-content-label {
+      display: flex;
+      align-items: center;
+    }
   }
 }
 .biz-platform-selector-select-overlay .biz-select-list-panel .biz-select-option {

package/es/platformSelector/util.d.ts

@@ -1,2 +1,2 @@
 import { platItemProp } from './types';
-export declare const platformOption: platItemProp[];
+export declare const platformOptionUtil: platItemProp[];

package/es/platformSelector/util.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { IconFont } from '@zgfe/business-lib';
-export var platformOption = [{
+export var platformOptionUtil = [{
   key: 0,
   value: '全部平台'
 }, {
@@ -38,6 +38,13 @@ export var platformOption = [{
     type: "fuwuqi",
     size: 16
   })
+}, {
+  key: 6,
+  value: '鸿蒙',
+  icon: /*#__PURE__*/React.createElement(IconFont, {
+    type: "hongmeng",
+    size: 16
+  })
 }, {
   key: -1,
   value: '其他'

package/es/userCondition/conditions/textDesc.js

@@ -393,7 +393,7 @@ var Text = function Text(props) {
         _value$between = value.between,
         between = _value$between === void 0 ? [] : _value$between;
       var numOperatorMap = _objectSpread(_objectSpread({}, operatorMap), {}, {
-        equal: '等于'
+        equal: value.webType === 'number' ? '等于' : '是'
       });
       var valuesDom = '';
       var calculateTxt = '';

package/es/userTagsSelector/cascaderOverlay.js

@@ -36,7 +36,8 @@ var CascaderOverlay = function CascaderOverlay(props) {
     labelFields = props.labelFields,
     keyFields = props.keyFields,
     valueFields = props.valueFields,
-    childFields = props.childFields;
+    childFields = props.childFields,
+    isOpenLayer = props.isOpenLayer;
   var timer = useRef(null);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -162,7 +163,8 @@ var CascaderOverlay = function CascaderOverlay(props) {
         labelGroup: currentSelect,
         pageNo: pageNo,
         pageSize: 20,
-        labelName: highlightText
+        labelName: highlightText,
+        isOpenLayer: isOpenLayer || true
       }
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.data) && res.data.results) {
@@ -172,6 +174,11 @@ var CascaderOverlay = function CascaderOverlay(props) {
             if (item.labelGroup === currentSelect) {
               item.children = pageNo === 1 ? _toConsumableArray(result) : item.children.concat(result);
             }
+            if (!isOpenLayer) {
+              item.children.forEach(function (element) {
+                element.layers = [];
+              });
+            }
             return _objectSpread({}, item);
           });
         });
@@ -209,7 +216,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
   }
   function onClickTag(data) {
     setCurrentTag(data);
-    if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.fundingSource || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.sqlCreateTable) {
+    if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.fundingSource || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.sqlCreateTable || !isOpenLayer) {
       var newValue = [{
         id: groupMap[currentSelect].id,
         labelGroup: currentSelect
@@ -230,7 +237,11 @@ var CascaderOverlay = function CascaderOverlay(props) {
       });
       if (_index === -1) {
         if (currentValue.length >= 20) return;
-        props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
+        if (isOpenLayer) {
+          props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
+        } else {
+          props.onChange([newValue]);
+        }
       } else {
         currentValue.splice(_index, 1);
         props.onChange(_toConsumableArray(currentValue));
@@ -269,7 +280,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
         getTagsByGroup(Math.floor(groupMap[currentSelect].children.length / 20) + 1);
       },
       onClick: onClickTag
-    }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.fundingSource && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.sqlCreateTable && /*#__PURE__*/React.createElement("div", {
+    }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), isOpenLayer && currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.fundingSource && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.sqlCreateTable && /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-overlay-selections")
     }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
       valueField: valueFields[2],
@@ -299,6 +310,7 @@ CascaderOverlay.defaultProps = {
   childFields: ['children', 'layers'],
   keyFields: ['labelGroup', 'id', 'layerLabelId'],
   labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
-  valueFields: ['labelGroup', 'id', 'layerLabelId']
+  valueFields: ['labelGroup', 'id', 'layerLabelId'],
+  isOpenLayer: true
 };
 export default CascaderOverlay;

package/es/userTagsSelector/index.js

@@ -26,7 +26,8 @@ var UserTagsSelect = function UserTagsSelect(props) {
     labelFields = props.labelFields,
     childFields = props.childFields,
     keyFields = props.keyFields,
-    valueFields = props.valueFields;
+    valueFields = props.valueFields,
+    isOpenLayer = props.isOpenLayer;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     currentValue = _useState2[0],
@@ -42,7 +43,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
       var pre_text = pre[labelFields[labelFields.length - 2]];
       var last_text = last[labelFields[labelFields.length - 1]];
       var res = _objectSpread(_objectSpread({}, last), {}, {
-        handleText: (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 3 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 6 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === LabelCreateType.sqlCreateTable ? pre_text : "".concat(pre_text, "\uFF1A").concat(last_text)
+        handleText: (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 3 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === 6 || (pre === null || pre === void 0 ? void 0 : pre.labelCreateType) === LabelCreateType.sqlCreateTable || !isOpenLayer ? pre_text : "".concat(pre_text, "\uFF1A").concat(last_text)
       });
       return res;
     });
@@ -75,6 +76,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
       keyFields: keyFields,
       labelFields: labelFields,
       data: data,
+      isOpenLayer: isOpenLayer,
       onChange: onChange
     });
   }
@@ -105,6 +107,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
   }))));
 };
 UserTagsSelect.defaultProps = {
-  destroyPopupOnHide: false
+  destroyPopupOnHide: false,
+  isOpenLayer: true
 };
 export default UserTagsSelect;

package/es/userTagsSelector/types.d.ts

@@ -30,6 +30,7 @@ export declare namespace UserTagsSelectorTypes {
         defaultCurrent?: string[];
         onChange: Function;
         destroyPopupOnHide?: boolean;
+        isOpenLayer?: boolean;
     }
     interface CascaderOverlayProps {
         className?: string;
@@ -40,6 +41,7 @@ export declare namespace UserTagsSelectorTypes {
         valueFields?: string[];
         currentValue: Value;
         onChange: (val: Value) => void;
+        isOpenLayer?: boolean;
     }
     interface Groups {
         data: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.55-ljy.2",
+  "version": "1.2.55-plat.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "16a7e43ce6281a248fab14d8dd3cff70ed0f9362",
+  "gitHead": "416ef69a9065601b94f15a4c712f46f792bf8485",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }