@zgfe/business-lib 1.2.34-tags.1 → 1.2.34-tags.2

package/es/userCondition/conditions/propCondition.js

@@ -63,13 +63,13 @@ var PropCondition = function PropCondition(props) {
         list.push({
           attr: attr,
           default: attr,
-          placeholder: placeholder,
+          placeholder: placeholder || '请选择属性',
           id: Math.random()
         });
       } else {
         list.push({
           attr: attr,
-          placeholder: placeholder,
+          placeholder: placeholder || '请选择属性',
           id: Math.random()
         });
       }
@@ -129,11 +129,9 @@ var PropCondition = function PropCondition(props) {
         category = _item$default.category,
         operator = _item$default.operator,
         params = _item$default.params,
-        attrType = _item$default.attrType,
-        placeholder = _item$default.placeholder;
+        attrType = _item$default.attrType;
       props.defaultValue = {
         attrName: attrName,
-        placeholder: placeholder,
         category: category || 'custom',
         operator: operator,
         values: params || [],
@@ -144,10 +142,17 @@ var PropCondition = function PropCondition(props) {
       if (userPropsMap[attrName] && userPropsMap[attrName].subtype) {
         props.defaultValue.subtype = userPropsMap[attrName].subtype;
       }
+    } else {
+      if (item.placeholder) {
+        props.value = _objectSpread(_objectSpread({}, props.value), {}, {
+          placeholder: item.placeholder || ''
+        });
+      }
     }
     if (isEvent) {
       props.eventIdList = [eventId];
     }
+    console.log('renderAttr', props);
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-prop-condition-attr"),
       key: id

package/es/userCondition/index.js

@@ -165,7 +165,7 @@ var BizUserCondition = function BizUserCondition(props) {
     setDataList(showList);
   }
   function onAdd(type) {
-    var condition = buildCondition(type);
+    var condition = buildCondition(type, props.labelCreateType);
     var newValue = [].concat(_toConsumableArray(value), [[condition]]);
     setValue(newValue);
     var newData = {

package/es/userCondition/types.d.ts

@@ -21,7 +21,10 @@ export declare enum LabelCreateType {
     eventPreference = 6,
     sqlCreateTable = 8,
     aum = 9,
-    fundingSource = 10
+    fundingSource = 10,
+    lostUser = 11,
+    riskLevel = 12,
+    financeValue = 13
 }
 export interface RunTimesI {
     operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
@@ -66,6 +69,7 @@ export declare namespace BizUserConditionT {
         openOrderDataCondition?: boolean;
         openCondition?: boolean;
         cdpTip?: string;
+        labelCreateType?: number;
     }
     interface BusinessPropsI {
         dataId: number;

package/es/userCondition/types.js

@@ -10,6 +10,9 @@ export var LabelCreateType;
   LabelCreateType[LabelCreateType["sqlCreateTable"] = 8] = "sqlCreateTable";
   LabelCreateType[LabelCreateType["aum"] = 9] = "aum";
   LabelCreateType[LabelCreateType["fundingSource"] = 10] = "fundingSource";
+  LabelCreateType[LabelCreateType["lostUser"] = 11] = "lostUser";
+  LabelCreateType[LabelCreateType["riskLevel"] = 12] = "riskLevel";
+  LabelCreateType[LabelCreateType["financeValue"] = 13] = "financeValue";
 })(LabelCreateType || (LabelCreateType = {}));
 export var PropType;
 (function (PropType) {

package/es/userCondition/util.d.ts

@@ -1,6 +1,6 @@
 import type { GlobalContextProps } from '../context';
 import type { BizUserConditionT, Unpacked } from './types';
-export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.BusinessCondition | BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition | BizUserConditionT.CdpCshCondition;
+export declare function buildCondition(type: BizUserConditionT.ConditionType, labelCreateType?: number): BizUserConditionT.BusinessCondition | BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition | BizUserConditionT.CdpCshCondition;
 export declare function transformNumberOperate(key: string, output?: boolean): string;
 export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;
 export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;

package/es/userCondition/util.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { LabelCreateType } from './types';
-export function buildCondition(type) {
+export function buildCondition(type, labelCreateType) {
   switch (type) {
     case 'add':
       var condition = {
@@ -52,7 +52,8 @@ export function buildCondition(type) {
       return {
         eventId: undefined,
         attrs: [{
-          attrId: 0
+          attrId: 0,
+          placeholder: labelCreateType === LabelCreateType.financeValue ? '风险等级' : ''
         }]
       };
     case 'tag':

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.34-tags.1",
+    "version": "1.2.34-tags.2",
     "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": "b65d61060a4d006a158139d0242943958d42b93e",
+    "gitHead": "528cbad3dd6181fb3877ccb46450e5e9fdbf0274",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }