@zgfe/business-lib 1.1.72-alpha.4 → 1.1.72-alpha.6

package/es/userCondition/conditionTypeList.js

@@ -74,7 +74,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) !== 2 && openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('cdp');

package/es/userCondition/conditions/cdpCshCondition.js

@@ -191,7 +191,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if ((data === null || data === void 0 ? void 0 : data.operator) === 'between') {
       data.between = fieldValue;
     } else {
-      data.params = fieldValue && fieldValue[0];
+      data.params = (field === null || field === void 0 ? void 0 : field.webType) === 'number' ? fieldValue && fieldValue[0] : fieldValue;
     }
     props.onChange(data);
   }, [dataset, field, calculate, operator, fieldValue, subDataset, subField, subcalculate, subOperator]);
@@ -494,8 +494,8 @@ var CdpCondition = function CdpCondition(props) {
     cdpConditions = _useState28[0],
     setCdpConditions = _useState28[1];
   useEffect(function () {
-    if (defaultValue && defaultValue.dataset_csh) {
-      setCdpConditions(defaultValue.dataset_csh);
+    if (defaultValue && defaultValue.data_set_csh) {
+      setCdpConditions(defaultValue.data_set_csh);
     }
   }, []);
   var onChangeCondition = function onChangeCondition(condition, index) {

package/es/userCondition/conditions/textDesc.js

@@ -37,7 +37,7 @@ var Text = function Text(props) {
     if (condition.dataset) {
       return renderCdp(condition);
     }
-    if (condition.dataset_csh) {
+    if (condition.data_set_csh) {
       return renderCshCdp(condition);
     }
     var data = condition;
@@ -377,13 +377,13 @@ var Text = function Text(props) {
     }));
   }
   function renderCshCdp(condition) {
-    var dataset_csh = condition.dataset_csh;
+    var data_set_csh = condition.data_set_csh;
     return /*#__PURE__*/React.createElement("span", {
       style: {
         backgroundColor: '#effcff',
         padding: '6px 7px'
       }
-    }, dataset_csh.map(function (value) {
+    }, data_set_csh.map(function (value) {
       if (!value) return null;
       var operator = value.operator,
         _value$params2 = value.params,

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

@@ -40,7 +40,7 @@ export declare const conditions: ({
         operator: string;
     };
     dataset?: undefined;
-    dataset_csh?: undefined;
+    data_set_csh?: undefined;
 } | {
     dataset: {
         datasetId: number;
@@ -55,9 +55,9 @@ export declare const conditions: ({
     }[];
     attrs?: undefined;
     labels?: undefined;
-    dataset_csh?: undefined;
+    data_set_csh?: undefined;
 } | {
-    dataset_csh: {
+    data_set_csh: {
         datasetName: string;
         datasetTable: string;
         fieldName: string;
@@ -79,7 +79,7 @@ export declare const conditions: ({
     labels?: undefined;
     dataset?: undefined;
 } | {
-    dataset_csh: {
+    data_set_csh: {
         datasetName: string;
         datasetTable: string;
         fieldName: string;
@@ -101,7 +101,7 @@ export declare const conditions: ({
     labels?: undefined;
     dataset?: undefined;
 } | {
-    dataset_csh: {
+    data_set_csh: {
         datasetName: string;
         datasetTable: string;
         fieldName: string;
@@ -116,7 +116,7 @@ export declare const conditions: ({
     labels?: undefined;
     dataset?: undefined;
 } | {
-    dataset_csh: {
+    data_set_csh: {
         datasetName: string;
         datasetTable: string;
         fieldName: string;

package/es/userCondition/demo/mockData.js

@@ -159,7 +159,7 @@ export var conditions = [[{
     params: ['123']
   }]
 }, {
-  dataset_csh: [{
+  data_set_csh: [{
     datasetName: 'rfm555',
     datasetTable: '99677e4429fd647bc4ff89f669859be168420',
     fieldName: 'price',
@@ -178,7 +178,7 @@ export var conditions = [[{
     }
   }]
 }, {
-  dataset_csh: [{
+  data_set_csh: [{
     datasetName: 'rfm555',
     datasetTable: '99677e4429fd647bc4ff89f669859be168420',
     fieldName: 'price',
@@ -197,7 +197,7 @@ export var conditions = [[{
     }
   }]
 }, {
-  dataset_csh: [{
+  data_set_csh: [{
     datasetName: 'rfm555',
     datasetTable: '99677e4429fd647bc4ff89f669859be168420',
     fieldName: 'price',
@@ -209,7 +209,7 @@ export var conditions = [[{
     params: '123'
   }]
 }, {
-  dataset_csh: [{
+  data_set_csh: [{
     datasetName: 'rfm555',
     datasetTable: '99677e4429fd647bc4ff89f669859be168420',
     fieldName: 'price',

package/es/userCondition/index.js

@@ -68,7 +68,7 @@ var BizUserCondition = function BizUserCondition(props) {
           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) {
-              if (data.dataset && !showCdp || data.labels && !showTag || data.dataset_csh && (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) != 2) {
+              if (data.dataset && !showCdp || data.labels && !showTag || data.data_set_csh && (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) != 2) {
                 showItem.splice(index, 1);
                 flag = true;
               }

package/es/userCondition/orConditions.js

@@ -123,7 +123,7 @@ var OrConditions = function OrConditions(props) {
         } else if (type === 'cdp') {
           data.condition.dataset = newData;
         } else if (type === 'cdp_csh') {
-          data.condition.dataset_csh = newData;
+          data.condition.data_set_csh = newData;
         } else if (type === 'business') {
           data.condition = newData;
         } else if (type === 'order') {
@@ -180,7 +180,7 @@ var OrConditions = function OrConditions(props) {
         dataId: id,
         onChange: onChangeCdp
       });
-    } else if (condition.dataset_csh) {
+    } else if (condition.data_set_csh) {
       if (!openCdpCondition) return null;
       conditionDom = /*#__PURE__*/React.createElement(CdpCshCondition, {
         defaultValue: condition,

package/es/userCondition/types.d.ts

@@ -206,7 +206,7 @@ export declare namespace BizUserConditionT {
         fieldType?: string;
         webType?: PropType;
         operator?: string;
-        params?: string;
+        params?: string | string[];
         paramType?: PropType;
         subCondition?: {
             datasetId?: number;
@@ -223,7 +223,7 @@ export declare namespace BizUserConditionT {
         dataset: (BizUserConditionT.CdpConditionDetail | undefined)[];
     }
     interface CdpCshCondition {
-        dataset_csh: (BizUserConditionT.CdpCshConditionDetail | undefined)[];
+        data_set_csh: (BizUserConditionT.CdpCshConditionDetail | undefined)[];
     }
     type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition | BusinessCondition | OrderCondition | CdpCondition | CdpCshCondition;
     type Conditions = Condition[][];

package/es/userCondition/util.js

@@ -70,7 +70,7 @@ export function buildCondition(type) {
       };
     case 'cdp_csh':
       return {
-        dataset_csh: [undefined]
+        data_set_csh: [undefined]
       };
     case 'business':
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.72-alpha.4",
+  "version": "1.1.72-alpha.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "c9084c55fe12fad7bf9de3f5e3a6a4c59640a54d"
+  "gitHead": "af99a8bb928e636cc5757571b1970028247ade6e"
 }