@zgfe/business-lib 1.2.34-tags.5 → 1.2.34-tags.7

package/es/userCondition/conditions/propCondition.js

@@ -62,7 +62,6 @@ var PropCondition = function PropCondition(props) {
         list.push({
           attr: attr,
           default: attr,
-          placeholder: placeholder || '请选择属性',
           id: Math.random()
         });
       } else {

package/es/userCondition/demo/index.js

@@ -43,12 +43,11 @@ export default (function () {
     openTagCondition: true,
     openCdpCondition: true,
     userTagsData: userTagsData,
-    labelCreateType: 12,
     isRealTime: true
   });
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 461
+    defaultApp: 99825
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'inline-block'

package/es/userCondition/index.js

@@ -165,7 +165,6 @@ var BizUserCondition = function BizUserCondition(props) {
     setDataList(showList);
   }
   function onAdd(type) {
-    console.log('props.labelCreateType)', props.labelCreateType);
     var condition = buildCondition(type, props.labelCreateType);
     var newValue = [].concat(_toConsumableArray(value), [[condition]]);
     setValue(newValue);
@@ -253,6 +252,7 @@ var BizUserCondition = function BizUserCondition(props) {
     return /*#__PURE__*/React.createElement(OrConditions, {
       showAndDesc: i > 0,
       orConditions: item.orConditions,
+      labelCreateType: props.labelCreateType,
       key: item.id,
       onChange: function onChange(data) {
         _onChange(item.id, data);

package/es/userCondition/orConditions.js

@@ -55,7 +55,7 @@ var OrConditions = function OrConditions(props) {
     setShowList(showList);
   }
   function onAdd(type) {
-    var condition = buildCondition(type);
+    var condition = buildCondition(type, props.labelCreateType);
     var newData = {
       id: Math.random(),
       condition: condition

package/es/userCondition/types.d.ts

@@ -142,6 +142,7 @@ export declare namespace BizUserConditionT {
         runTimes: RunTimesI;
         runPeriod: RunPeriodI;
         eventId: number;
+        placeholder?: string;
     }
     interface AddCondition {
         eventId: '-3';
@@ -255,6 +256,7 @@ export declare namespace OrConditionsT {
         onChange: (value: any[]) => void;
         orConditions: BizUserConditionT.Conditions[number];
         showAndDesc: boolean;
+        labelCreateType?: number;
     }
     interface ShowItemI {
         id: number;

package/es/userCondition/util.js

@@ -6,7 +6,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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, labelCreateType) {
-  console.log('buildCondition', labelCreateType);
   switch (type) {
     case 'add':
       var condition = {
@@ -47,7 +46,8 @@ export function buildCondition(type, labelCreateType) {
         runPeriod: {
           operator: 'relative',
           values: ['30', '0']
-        }
+        },
+        placeholder: labelCreateType === LabelCreateType.lostUser ? '进入App' : ''
       };
     case 'prop':
       return {

package/package.json

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