@zgfe/business-lib 1.2.38 → 1.2.39

package/es/userCondition/conditionTypeList.js

@@ -61,12 +61,12 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "prop"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))) : null, openTagCondition && authority[10038] ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027\u6EE1\u8DB3"))) : null, openTagCondition && authority[10038] ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('tag');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('cdp_csh');
@@ -84,7 +84,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2 ? /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' && (openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "business",
     onClick: function onClick() {
@@ -92,7 +92,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "business"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))) : null, openOrderDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2 ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' && (openOrderDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "order",
     onClick: function onClick() {

package/es/userCondition/conditions/cdpCondition.js

@@ -21,20 +21,17 @@ import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
-import BizGlobalDataContext from '../../context';
 var classPrefix = 'biz-user-condition-cdp';
 var CdpConditionItem = function CdpConditionItem(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
-  var _useContext2 = useContext(BizUserConditionContext),
-    _useContext2$datasetL = _useContext2.datasetList,
-    datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
+  var _useContext = useContext(BizUserConditionContext),
+    _useContext$datasetLi = _useContext.datasetList,
+    datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
   var _useState = useState(function () {
       if (props.value) {
-        return {
+        return _objectSpread(_objectSpread({}, props.value), {}, {
           id: props.value.datasetId,
           tableName: props.value.datasetTable
-        };
+        });
       }
       return;
     }),
@@ -74,6 +71,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       datasetId = _props$value.datasetId,
       datasetTable = _props$value.datasetTable,
       datasetName = _props$value.datasetName,
+      metaDatasetId = _props$value.metaDatasetId,
       fieldName = _props$value.fieldName,
       fieldType = _props$value.fieldType,
       webType = _props$value.webType,
@@ -82,7 +80,9 @@ var CdpConditionItem = function CdpConditionItem(props) {
     setDataset({
       id: datasetId,
       tableName: datasetTable,
-      datasetName: datasetName
+      datasetId: datasetId,
+      datasetName: datasetName,
+      metaDatasetId: metaDatasetId
     });
     setField({
       name: fieldName,
@@ -95,7 +95,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (params) {
       setFieldValue(params);
     }
-    onDatasetChange(datasetId);
+    onDatasetChange(datasetTable);
     setTimeout(function () {
       setIsFirst(false);
     }, 0);
@@ -104,7 +104,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (isFirst) return;
     if (!dataset) return;
     props.onChange({
-      datasetId: dataset.id,
+      metaDatasetId: dataset.metaDatasetId,
+      datasetId: dataset.datasetId,
       datasetTable: dataset.tableName,
       datasetName: dataset.datasetName,
       fieldName: field === null || field === void 0 ? void 0 : field.name,
@@ -131,18 +132,16 @@ var CdpConditionItem = function CdpConditionItem(props) {
       return PropType.DATE;
     }
   };
-  var onDatasetChange = function onDatasetChange(datasetId) {
-    if (!datasetId) {
+  var onDatasetChange = function onDatasetChange(tableName) {
+    if (!tableName) {
       setFieldList([]);
       return;
     }
     setLoading(true);
-    request(Apis.queryDatasetDetail, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
-        datasetId: datasetId
+    request(Apis.queryTableInfo, {
+      method: 'get',
+      params: {
+        tableName: tableName
       }
     }).then(function (result) {
       setLoading(false);
@@ -160,7 +159,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     });
     setOperator(undefined);
     setFieldValue([]);
-    onDatasetChange(data.id);
+    onDatasetChange(data.tableName);
   };
   var onFieldChange = function onFieldChange(data) {
     setField(data);
@@ -260,8 +259,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     className: "".concat(classPrefix, "-select-dataset"),
     options: datasetList,
     placeholder: "\u9009\u62E9\u660E\u7EC6\u8868",
-    labelField: "datasetName",
-    keyField: "tableName",
+    labelField: "name",
+    keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
   }), dataset ? /*#__PURE__*/React.createElement("div", {

package/es/userCondition/conditions/cdpCshCondition.js

@@ -21,20 +21,17 @@ import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
-import BizGlobalDataContext from '../../context';
 var classPrefix = 'biz-user-condition-cdp-csh';
 var CdpConditionItem = function CdpConditionItem(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
-  var _useContext2 = useContext(BizUserConditionContext),
-    _useContext2$datasetL = _useContext2.datasetList,
-    datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
+  var _useContext = useContext(BizUserConditionContext),
+    _useContext$datasetLi = _useContext.datasetList,
+    datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
   var _useState = useState(function () {
       if (props.value) {
-        return {
+        return _objectSpread(_objectSpread({}, props.value), {}, {
           id: props.value.datasetId,
           tableName: props.value.datasetTable
-        };
+        });
       }
       return;
     }),
@@ -98,6 +95,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       datasetId = _props$value.datasetId,
       datasetName = _props$value.datasetName,
       datasetTable = _props$value.datasetTable,
+      metaDatasetId = _props$value.metaDatasetId,
       fieldName = _props$value.fieldName,
       fieldType = _props$value.fieldType,
       webType = _props$value.webType,
@@ -108,8 +106,10 @@ var CdpConditionItem = function CdpConditionItem(props) {
       subCondition = _props$value.subCondition;
     setDataset({
       id: datasetId,
+      datasetId: datasetId,
       tableName: datasetTable,
-      datasetName: datasetName
+      datasetName: datasetName,
+      metaDatasetId: metaDatasetId
     });
     setField({
       name: fieldName,
@@ -122,8 +122,10 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (subCondition) {
       setSubDataset({
         id: subCondition.datasetId,
+        datasetId: subCondition.datasetId,
         tableName: subCondition.datasetTable,
-        datasetName: subCondition.datasetName
+        datasetName: subCondition.datasetName,
+        metaDatasetId: subCondition.metaDatasetId
       });
       setSubField({
         name: subCondition.fieldName,
@@ -148,9 +150,9 @@ var CdpConditionItem = function CdpConditionItem(props) {
       });
     }
     if (params || between) {
-      setFieldValue(operator === 'between' ? between : [params]);
+      setFieldValue(operator === 'between' ? between : Array.isArray(params) ? params : [params]);
     }
-    onDatasetChange(datasetId);
+    onDatasetChange(datasetTable);
     setTimeout(function () {
       setIsFirst(false);
     }, 0);
@@ -159,9 +161,10 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (isFirst) return;
     if (!dataset) return;
     var data = {
-      datasetId: dataset.id,
-      datasetName: dataset.datasetName,
+      metaDatasetId: dataset.metaDatasetId,
+      datasetId: dataset.datasetId,
       datasetTable: dataset.tableName,
+      datasetName: dataset.datasetName,
       fieldName: field === null || field === void 0 ? void 0 : field.name,
       fieldType: field === null || field === void 0 ? void 0 : field.type,
       webType: field === null || field === void 0 ? void 0 : field.webType,
@@ -172,9 +175,10 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (['add', 'subtraction', 'multiplication', 'division'].includes((operator === null || operator === void 0 ? void 0 : operator.value) || '')) {
       data.subCondition = {
         operator: operator === null || operator === void 0 ? void 0 : operator.value,
-        datasetId: subDataset && subDataset.id,
+        datasetId: subDataset && subDataset.datasetId,
         datasetName: subDataset && subDataset.datasetName,
         datasetTable: subDataset && subDataset.tableName,
+        metaDatasetId: subDataset && subDataset.metaDatasetId,
         fieldName: subField === null || subField === void 0 ? void 0 : subField.name,
         calculate: subcalculate === null || subcalculate === void 0 ? void 0 : subcalculate.value
       };
@@ -203,18 +207,16 @@ var CdpConditionItem = function CdpConditionItem(props) {
       return PropType.DATE;
     }
   };
-  var onDatasetChange = function onDatasetChange(datasetId, isSub) {
-    if (!datasetId) {
+  var onDatasetChange = function onDatasetChange(tableName, isSub) {
+    if (!tableName) {
       isSub ? setSubFieldList([]) : setFieldList([]);
       return;
     }
     setLoading(true);
-    request(Apis.queryDatasetDetail, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
-        datasetId: datasetId
+    request(Apis.queryTableInfo, {
+      method: 'get',
+      params: {
+        tableName: tableName
       }
     }).then(function (result) {
       setLoading(false);
@@ -234,7 +236,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     });
     setOperator(undefined);
     setFieldValue([]);
-    onDatasetChange(data.id);
+    onDatasetChange(data.tableName);
   };
   var onSubTableChange = function onSubTableChange(data) {
     setSubDataset(data);
@@ -242,7 +244,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       name: undefined
     });
     setSubOperator(undefined);
-    onDatasetChange(data.id, true);
+    onDatasetChange(data.tableName, true);
   };
   var onFieldChange = function onFieldChange(data) {
     setField(data);
@@ -401,8 +403,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
       className: "".concat(classPrefix, "-select-dataset"),
       options: datasetList,
       placeholder: "\u9009\u62E9\u660E\u7EC6\u8868",
-      labelField: "datasetName",
-      keyField: "tableName",
+      labelField: "name",
+      keyField: "metaDatasetId",
       value: subDataset,
       onChange: onSubTableChange
     }), /*#__PURE__*/React.createElement("div", {
@@ -458,8 +460,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     className: "".concat(classPrefix, "-select-dataset"),
     options: datasetList,
     placeholder: "\u9009\u62E9\u660E\u7EC6\u8868",
-    labelField: "datasetName",
-    keyField: "tableName",
+    labelField: "name",
+    keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
   }), dataset ? /*#__PURE__*/React.createElement("div", {

package/es/userCondition/conditions/tagsCondition.js

@@ -15,6 +15,7 @@ import { BizUserConditionContext, classPrefix } from '..';
 import BizSelect from '../../select';
 import { operatorMap } from './constants';
 import BizUserTagsSelect from '../../userTagsSelector';
+import BizGlobalDataContext from '../../context';
 import './styles/tagsCondition.less';
 import _ from 'lodash';
 import { buildSelectLayer } from '../util';
@@ -28,6 +29,8 @@ var options = [{
 var TagsCondition = function TagsCondition(props) {
   var _useContext = useContext(BizUserConditionContext),
     userTagsData = _useContext.userTagsData;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    currentApp = _useContext2.currentApp;
   var labels = props.labels,
     dataId = props.dataId,
     onChange = props.onChange;
@@ -67,7 +70,7 @@ var TagsCondition = function TagsCondition(props) {
     className: "".concat(classPrefix, "-tags-condition")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tags-condition-label")
-  }, "\u7528\u6237\u6807\u7B7E"), /*#__PURE__*/React.createElement("div", {
+  }, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户标签' : '主体标签'), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tags-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     options: options,

package/es/userCondition/demo/index.js

@@ -47,7 +47,7 @@ export default (function () {
   });
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 99825
+    defaultApp: 86284
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'inline-block'

package/es/userCondition/index.js

@@ -1,4 +1,7 @@
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -16,7 +19,6 @@ import OrConditions from './orConditions';
 import './styles/index.less';
 import { buildCondition } from './util';
 import BizGlobalDataContext from '../context';
-import IconFont from '../icon/iconFont';
 import request from '../utils/ajax';
 import Apis from '../constants/apis';
 import { Spin } from 'antd';
@@ -65,7 +67,7 @@ var BizUserCondition = function BizUserCondition(props) {
         var showTag = openTagCondition && authority[10038];
         var showCdp = openCdpCondition && authority[1006];
         var flag = false;
-        defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.forEach(function (item) {
+        Array.isArray(defaultValue) && (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.forEach(function (item) {
           var showItem = _toConsumableArray(item);
           if (!(showTag && showCdp && (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2)) {
             item === null || item === void 0 ? void 0 : item.forEach(function (data, index) {
@@ -85,7 +87,7 @@ var BizUserCondition = function BizUserCondition(props) {
           if (showItem.length > 0) {
             list.push(showItem);
           }
-        });
+        }));
         if (flag) {
           props.onChange(list);
         }
@@ -123,36 +125,6 @@ var BizUserCondition = function BizUserCondition(props) {
       setLoading(false);
     }
   }, []);
-  var haveCdpValues = useMemo(function () {
-    var flag = false;
-    var _iterator = _createForOfIteratorHelper(value),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var condition = _step.value;
-        var _iterator2 = _createForOfIteratorHelper(condition),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var item = _step2.value;
-            if (item.dataset || item.data_set_csh) {
-              flag = true;
-              break;
-            }
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    return flag;
-  }, [value]);
   function initShowList() {
     var showList = [];
     value.forEach(function (item) {
@@ -205,20 +177,41 @@ var BizUserCondition = function BizUserCondition(props) {
     props.onChange && props.onChange(newValue);
   }
   function getDatasetList() {
-    request(Apis.queryDatasetList, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
-      }
-    }).then(function (result) {
-      setDataset(result.data || []);
-      setLoading(false);
-    }).catch(function (e) {
-      console.error(e);
-      setDataset([]);
-      setLoading(false);
-    });
+    return _getDatasetList.apply(this, arguments);
+  }
+  function _getDatasetList() {
+    _getDatasetList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return request(Apis.queryMetaDatasetList, {
+              method: 'post',
+              data: {
+                appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+              }
+            });
+          case 3:
+            res = _context.sent;
+            setDataset(res.data);
+            setLoading(false);
+            _context.next = 13;
+            break;
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](0);
+            console.error(_context.t0);
+            setDataset([]);
+            setLoading(false);
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 8]]);
+    }));
+    return _getDatasetList.apply(this, arguments);
   }
   if (loading) {
     return /*#__PURE__*/React.createElement(Spin, null);
@@ -262,11 +255,7 @@ var BizUserCondition = function BizUserCondition(props) {
     show: value.length < andConditionNum,
     label: "\u4E14",
     onAdd: onAdd
-  }), openCdpCondition && authority[1006] && !props.textMode && haveCdpValues ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-tip")
-  }, ' ', /*#__PURE__*/React.createElement(IconFont, {
-    type: "tishiicon"
-  }), "\u660E\u7EC6\u8868\u4E2D\u9700\u5B58\u5728\u300Capp_user_id\u300D\u6761\u4EF6\u65B9\u53EF\u751F\u6548\u3002") : null));
+  })));
 };
 BizUserCondition.defaultProps = {
   andConditionNum: 5,

package/es/userCondition/types.d.ts

@@ -189,6 +189,8 @@ export declare namespace BizUserConditionT {
     }
     interface CdpDataSet {
         id: number;
+        metaDatasetId?: number;
+        datasetId: number;
         datasetName: string;
         tableName: string;
     }
@@ -198,6 +200,7 @@ export declare namespace BizUserConditionT {
         webType?: PropType;
     }
     interface CdpConditionDetail {
+        metaDatasetId?: number;
         datasetId?: number;
         datasetTable?: string;
         datasetName?: string;
@@ -210,6 +213,7 @@ export declare namespace BizUserConditionT {
     }
     interface CdpCshConditionDetail {
         datasetId?: number;
+        metaDatasetId?: number;
         datasetTable?: string;
         datasetName?: string;
         fieldName?: string;
@@ -220,6 +224,7 @@ export declare namespace BizUserConditionT {
         paramType?: PropType;
         subCondition?: {
             datasetId?: number;
+            metaDatasetId?: number;
             datasetTable?: string;
             datasetName?: string;
             fieldName?: string;

package/es/userGroup/index.js

@@ -136,7 +136,6 @@ var BizUserGroup = function BizUserGroup(_ref) {
       return /*#__PURE__*/React.createElement(Overlay, {
         onClose: setOpen.bind(undefined, false),
         onClickCreate: function onClickCreate() {
-          console.log('点击新建用户群');
           setOpen(false);
         }
       });

package/es/userGroup/overlay.js

@@ -129,9 +129,7 @@ var Overlay = function Overlay(_ref2) {
     onClick: onClickAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "zengjia"
-  }), "\u65B0\u5EFA\u7528\u6237\u7FA4")), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-divider")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6240\u6709\u7528\u6237")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }), "\u65B0\u5EFA\u7528\u6237\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",

package/es/userGroup/styles/index.less

@@ -133,7 +133,6 @@
   &-list {
     flex: 1;
     max-height: 320px;
-    margin-top: @margin-md;
     overflow: auto;
   }
   &-item {

package/es/utils/util.d.ts

@@ -10,6 +10,7 @@ declare let util: {
     isBlob(obj: any): boolean;
     isEqual(a?: {}, b?: {}): boolean;
     equal(a: any, b: any): boolean;
+    getParamByUrl(name: string, url?: string): string | null;
     random(min: number, max: number): number;
     guid(): string;
     mergeObject(defaults: {

package/es/utils/util.js

@@ -33,6 +33,15 @@ var util = {
   equal: function equal(a, b) {
     return JSON.stringify(a) === JSON.stringify(b);
   },
+  getParamByUrl: function getParamByUrl(name, url) {
+    if (!url) url = window.location.href;
+    name = name.replace(/[\[\]]/g, '\\$&');
+    var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
+      results = regex.exec(url);
+    if (!results) return null;
+    if (!results[2]) return '';
+    return decodeURIComponent(results[2].replace(/\+/g, ' '));
+  },
   random: function random(min, max) {
     return Math.round(Math.random() * (max - min)) + min;
   },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.38",
+    "version": "1.2.39",
     "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": "3195eace807d40555519a3223cfa3748498862e2",
+    "gitHead": "39e347891d736be091704d410225760d1a996d7a",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }

package/es/demoWrapper/head.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-import { AppInfoProps } from '../context';
-declare const DemoHeader: React.FC<{
-    defaultApp?: number;
-    onChangeApp?: (app: AppInfoProps) => void;
-    onLoading?: (loading: boolean) => void;
-    onLogin?: () => void;
-}>;
-export default DemoHeader;