@zgfe/business-lib 1.1.3-user.1 → 1.1.3-user.3

package/es/userCondition/conditions/textDesc.js

@@ -40,6 +40,8 @@ var Text = function Text(props) {
       userTagsData = _useContext3.userTagsData;
 
   function render() {
+    console.log('render:', condition);
+
     if (condition.labels) {
       return renderTags(condition);
     }

package/es/userCondition/demo/index.js

@@ -50,7 +50,7 @@ export default (function () {
   }, [conditions]);
 
   function onChange(value) {
-    console.log('change:', JSON.stringify(value));
+    console.log('change:', JSON.parse(JSON.stringify(value)));
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {

package/es/userCondition/index.js

@@ -24,7 +24,6 @@ import RelationLabel from './relationLabel';
 import OrConditions from './orConditions';
 import './styles/index.less';
 import { buildCondition } from './util';
-import _ from 'lodash';
 import BizGlobalDataContext from '../context';
 import IconFont from '../icon/iconFont';
 import request from '../utils/ajax';
@@ -67,11 +66,35 @@ var BizUserCondition = function BizUserCondition(props) {
       setDataList = _useState4[1];
 
   var _useState5 = useState(function () {
+    var list = [];
+
     if (defaultValue) {
-      return _.cloneDeep(defaultValue);
+      var showTag = openTagCondition && (!menuNameMap || menuNameMap['userTags']);
+      var showCdp = openCdpCondition && (!menuNameMap || menuNameMap['dataset']);
+      var flag = false;
+      defaultValue.forEach(function (item) {
+        var showItem = _toConsumableArray(item);
+
+        if (!(showTag && showCdp)) {
+          item.forEach(function (data, index) {
+            if (data.dataset && !showCdp || data.labels && !showTag) {
+              showItem.splice(index, 1);
+              flag = true;
+            }
+          });
+        }
+
+        if (showItem.length > 0) {
+          list.push(showItem);
+        }
+      });
+
+      if (flag) {
+        props.onChange(list);
+      }
     }
 
-    return [];
+    return list;
   }),
       _useState6 = _slicedToArray(_useState5, 2),
       value = _useState6[0],
@@ -111,29 +134,11 @@ var BizUserCondition = function BizUserCondition(props) {
 
   function initShowList() {
     var showList = [];
-    var showTag = openTagCondition && (!menuNameMap || menuNameMap['userTags']);
-    var showCdp = openCdpCondition && (!menuNameMap || menuNameMap['dataset']);
     value.forEach(function (item) {
-      var showItem = _toConsumableArray(item);
-
-      if (!(showTag && showCdp)) {
-        item.forEach(function (data, index) {
-          if (data.dataset && !showCdp) {
-            showItem.splice(index, 1);
-          }
-
-          if (data.labels && !showTag) {
-            showItem.splice(index, 1);
-          }
-        });
-      }
-
-      if (showItem.length > 0) {
-        showList.push({
-          id: Math.random(),
-          orConditions: showItem
-        });
-      }
+      showList.push({
+        id: Math.random(),
+        orConditions: item
+      });
     });
     setShowList(showList);
     setDataList(showList);

package/es/userCondition/orConditions.js

@@ -50,6 +50,8 @@ var OrConditions = function OrConditions(props) {
       setShowList = _useState2[1];
 
   useEffect(function () {
+    console.log('orConditions:', orConditions);
+
     if (orConditions) {
       initShowList();
     }
@@ -64,6 +66,7 @@ var OrConditions = function OrConditions(props) {
       };
       showList.push(item);
     });
+    console.log('showList:', showList);
     setShowList(showList);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.3-user.1",
+  "version": "1.1.3-user.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "513c2967ae788c511226f44e778f204eecd9086e"
+  "gitHead": "e22bc32b4be87eb1d3390d9861ddfda9e099f1ca"
 }