@chaoswise/business 0.0.5 → 0.0.6

package/lib/PropertyControlViewer/components/DoUser.js

@@ -1,8 +1,10 @@
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _Avatar from "@chaoswise/ui/lib/Antd/Avatar";
+import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
 import React, { Fragment } from 'react';
 import '../assets/index.less';
 import TagShowMoreList from './TagShowMoreList';
+import { getLocale } from "../../locale";
 var DoUser = function DoUser(_ref) {
   var data = _ref.data;
   var belongComponentType = data.belongComponentType,
@@ -10,6 +12,22 @@ var DoUser = function DoUser(_ref) {
     tooltipContent = data.tooltipContent,
     list = data.list,
     componentType = data.componentType;
+  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
+    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
+    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
+  var localeObj = getLocale(locale);
+  var userTooltip = {
+    userName: localeObj.name + ":",
+    userAlias: localeObj.userName + ":",
+    department: localeObj.department + ":",
+    email: localeObj.emil + ":",
+    mobile: localeObj.mobile + ":"
+  };
+  var userGroupTooltip = {
+    groupName: localeObj.groupName + ":",
+    groupDetails: localeObj.groupDetails + ":"
+  };
+  tooltipContent = componentType === "USER_GROUP" ? userGroupTooltip : userTooltip;
   var gridShare = belongComponentType === "TABLE" ? '100%' : fieldWidth == 'WHOLE_LINE' ? '25%' : '50%';
   var tooltipContentFuc = function tooltipContentFuc(item) {
     return Object.keys(tooltipContent).map(function (key) {

package/lib/PropertyControlViewer/config/utils.js

@@ -133,8 +133,10 @@ export var judgmentTypeFunc = function judgmentTypeFunc(type, value) {
       break;
     case "UNIT_BITMAP":
       judgmentType = Object.prototype.toString.call(value) === "[object Object]";
+      break;
     default:
       judgmentType = true;
+      break;
   }
   return judgmentType;
 };
@@ -164,7 +166,7 @@ export var getDataFunc = function getDataFunc(value, item, rest) {
           expandable: true
         },
         list: [{
-          value: value ? unit ? value + " " + unit : value : '--'
+          value: unit ? value + " " + unit : value
         }]
       };
       break;
@@ -173,7 +175,7 @@ export var getDataFunc = function getDataFunc(value, item, rest) {
     case "AUTO_CALCULATE":
       data = {
         list: [{
-          value: value ? unit ? value + " " + unit : value : '--'
+          value: !(value === undefined || value === null || value === '') ? unit ? value + " " + unit : value : '--'
         }]
       };
       break;
@@ -257,7 +259,6 @@ export var getDataFunc = function getDataFunc(value, item, rest) {
         email: "邮箱:",
         mobile: "手机:"
       };
-      console.log(value, 'value]]]]]]');
       data = {
         fieldWidth: fieldWidth,
         tooltipContent: userTooltipContent || userTooltip,

package/lib/locale/en_US.js

@@ -0,0 +1,9 @@
+export default {
+  name: 'Name',
+  userName: 'Username',
+  department: 'Department',
+  emil: 'Email',
+  mobile: "Phone",
+  groupName: 'User group',
+  groupDetails: 'Description'
+};

package/lib/locale/index.js

@@ -0,0 +1,12 @@
+import zhCN from './zh_CN.js';
+import enUS from './en_US.js';
+export var getLocale = function getLocale(locale) {
+  switch (locale) {
+    case 'zh':
+      return zhCN;
+    case 'en':
+      return enUS;
+    default:
+      return zhCN;
+  }
+};

package/lib/locale/zh_CN.js

@@ -0,0 +1,9 @@
+export default {
+  name: '姓名',
+  userName: '用户名',
+  department: '部门',
+  emil: '邮箱',
+  mobile: "手机",
+  groupName: '用户组',
+  groupDetails: '描述'
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/business",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "业务组件库",
   "keywords": [
     "ui",
@@ -102,5 +102,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "780a8854dd697d36c4d9b7d83fd45cf7aabf082e"
+  "gitHead": "e5466e86469163cd6a3964a7e03684ab71c5c20f"
 }