@zgfe/business-lib 1.0.30-user.3 → 1.0.30-user.5

package/es/userCondition/conditions/cdpCondition.js

@@ -91,6 +91,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     var _props$value = props.value,
         datasetId = _props$value.datasetId,
         datasetTable = _props$value.datasetTable,
+        datasetName = _props$value.datasetName,
         fieldName = _props$value.fieldName,
         fieldType = _props$value.fieldType,
         webType = _props$value.webType,
@@ -98,7 +99,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
         params = _props$value.params;
     setDataset({
       id: datasetId,
-      tableName: datasetTable
+      tableName: datasetTable,
+      datasetName: datasetName
     });
     setField({
       name: fieldName,
@@ -124,6 +126,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     props.onChange({
       datasetId: dataset.id,
       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,

package/es/userCondition/conditions/textDesc.js

@@ -251,7 +251,7 @@ var Text = function Text(props) {
 
       return /*#__PURE__*/React.createElement("span", {
         key: Math.random()
-      }, "".concat(value.datasetTable, "\u4E2D").concat(value.fieldName).concat(valuesDom));
+      }, "".concat(value.datasetName, "\u4E2D").concat(value.fieldName).concat(valuesDom));
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
 

package/es/userCondition/demo/mockData.d.ts

@@ -77,6 +77,7 @@ export declare const conditions: {
     dataset: {
         datasetId: number;
         datasetTable: string;
+        datasetName: string;
         fieldName: string;
         fieldType: string;
         webType: string;

package/es/userCondition/demo/mockData.js

@@ -538,6 +538,7 @@ export var conditions = [[{
   dataset: [{
     datasetId: 174,
     datasetTable: '181e55e003bc25945698fdb2e65d3c2193d',
+    datasetName: 's6',
     fieldName: 'a_id',
     fieldType: 'bigint',
     webType: 'number',

package/es/userCondition/index.js

@@ -220,7 +220,7 @@ var BizUserCondition = function BizUserCondition(props) {
     show: value.length < andConditionNum,
     label: "\u4E14",
     onAdd: onAdd
-  }), openCdpCondition && (!menuNameMap || menuNameMap['cdp']) ? /*#__PURE__*/React.createElement("div", {
+  }), openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tip")
   }, ' ', /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"

package/es/userCondition/types.d.ts

@@ -113,6 +113,7 @@ export declare namespace BizUserConditionT {
     interface CdpConditionDetail {
         datasetId?: number;
         datasetTable?: string;
+        datasetName?: string;
         fieldName?: string;
         fieldType?: string;
         webType?: PropType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.30-user.3",
+  "version": "1.0.30-user.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "eaa12ea299f24b2fbb4f33437c89e28c2df32903"
+  "gitHead": "fe2c84b666fecef5382c34648e25f36feb1745a2"
 }