1
0

2 Incheckningar a217587828 ... e0f064a3f7

Upphovsman SHA1 Meddelande Datum
  zlSun e0f064a3f7 Merge remote-tracking branch 'origin/master' 1 år sedan
  zlSun a715015486 对title进行搜索与修改 1 år sedan

+ 1 - 1
atlas/js/templates/audit/AdminAuditTableLayoutView_tmpl.html

@@ -35,7 +35,7 @@
                                     <a>管理员</a>
                                 </h4>
                                 <div class="btn-group pull-right">
-                                    <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                                    <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
                                 </div>
                             </div>
                             <div id="collapseAdmin" class="panel-collapse collapse in">

+ 6 - 6
atlas/js/templates/audit/CreateAuditTableLayoutView_tmpl.html

@@ -22,7 +22,7 @@
                 <a>特性 </a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div id="detailAttributeTableCollapse" class="panel-collapse collapse in">
@@ -40,10 +40,10 @@
     <div class="panel panel-default custom-panel expand_collapse_panel-icon hide col-sm-5" data-id="attributeDetails">
         <div class="panel-heading" data-toggle="collapse" href={{technicalPropPanelId.anchor}} aria-expanded="true">
             <h4 class="panel-title">
-                <a data-id="panel-attr-heading">Technical properties </a>
+                <a data-id="panel-attr-heading">技术性能</a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div id={{technicalPropPanelId.id}} class="panel-collapse collapse in">
@@ -64,7 +64,7 @@
                 <a>关系特征 </a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div id={{relationshipPropPanelId.id}} class="panel-collapse collapse in">
@@ -85,7 +85,7 @@
                 <a>用户定义的特征 </a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div id={{userdefinedPropPanelId.id}} class="panel-collapse collapse in">
@@ -106,7 +106,7 @@
                 <a>标签</a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div id="labelsTableCollapse" class="panel-collapse collapse in">

+ 2 - 2
atlas/js/templates/common/TableLayout_tmpl.html

@@ -43,7 +43,7 @@
                     <div class="input-group" data-id="goToPageDiv">
                         <input type="text" class="form-control number-input" data-id="gotoPage" placeholder="目标页面" />
                         <span class="input-group-btn">
-                            <button class="btn btn-default" type="button" data-id="gotoPagebtn" title="跳转" disabled="disabled">Go!</button>
+                            <button class="btn btn-default" type="button" data-id="gotoPagebtn" title="跳转" disabled="disabled">跳转!</button>
                         </span>
                     </div>
                 </div>
@@ -90,7 +90,7 @@
                     <div class="input-group" data-id="goToPageDiv">
                         <input type="text" class="form-control number-input" data-id="gotoPage" placeholder="目标页面" />
                         <span class="input-group-btn">
-                            <button class="btn btn-default" type="button" data-id="gotoPagebtn" title="跳转至" disabled="disabled">Go!</button>
+                            <button class="btn btn-default" type="button" data-id="gotoPagebtn" title="跳转至" disabled="disabled">跳转!</button>
                         </span>
                     </div>
                 </div>

+ 1 - 1
atlas/js/templates/entity/EntityBusinessMetaDataView_tmpl.html

@@ -20,7 +20,7 @@
             <a>业务元数据</a>
         </h4>
         <div class="btn-group pull-left">
-            <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+            <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
         </div>
     </div>
     {{#ifCond readOnlyEntity "===" false}}

+ 1 - 1
atlas/js/templates/entity/EntityDetailTableLayoutView_tmpl.html

@@ -21,7 +21,7 @@
                 <a>技术性能 </a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div class="panel-actions">

+ 2 - 2
atlas/js/templates/entity/EntityLabelDefineView_tmpl.html

@@ -22,11 +22,11 @@
                 <a>标签 </a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         {{else}}
-        <div class="panel-heading" data-toggle="collapse" href={{div_2.anchor}} aria-expanded="true" style="width: 70%">
+        <div class="panel-heading" data-toggle="折叠" href={{div_2.anchor}} aria-expanded="true" style="width: 70%">
             <h4 class="panel-title">
                 <a>标签 </a>
             </h4>

+ 2 - 2
atlas/js/templates/entity/EntityUserDefineView_tmpl.html

@@ -22,11 +22,11 @@
                 <a>用户定义的特性 </a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         {{else}}
-        <div class="panel-heading" data-toggle="collapse" href={{divId_2.anchor}} aria-expanded="true" style="width: 70%">
+        <div class="panel-heading" data-toggle="折叠" href={{divId_2.anchor}} aria-expanded="true" style="width: 70%">
             <h4 class="panel-title">
                 <a>用户定义的特性 </a>
             </h4>

+ 1 - 1
atlas/js/templates/site/Statistics_tmpl.html

@@ -32,7 +32,7 @@
                 <a>实体 <span class="count">(0)</span></a>
             </h4>
             <div class="btn-group pull-left">
-                <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
+                <button type="button" title="折叠"><i class="ec-icon fa"></i></button>
             </div>
         </div>
         <div id="entityCountCollapse" class="panel-collapse collapse in">

+ 2 - 2
atlas/js/utils/CommonViewFunction.js

@@ -59,7 +59,7 @@ define([ "require", "utils/Utils", "modules/Modal", "utils/Messages", "utils/Enu
                     var value = "", deleteButton = "", data = serverData;
                     value = Utils.getName(data);
                     var id = "";
-                    data.guid && (Enums.entityStateReadOnly[data.status || data.entityStatus] && (deleteButton += '<button title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>'),
+                    data.guid && (Enums.entityStateReadOnly[data.status || data.entityStatus] && (deleteButton += '<button title="已删除" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>'),
                     id = data.guid), value.length > 0 ? scope.$('td div[data-id="' + id + '"]').html('<a href="#!/detailPage/' + id + '">' + getValue(value) + "</a>") : scope.$('td div[data-id="' + id + '"]').html('<a href="#!/detailPage/' + id + '">' + _.escape(id) + "</a>"),
                     deleteButton.length && (scope.$('td div[data-id="' + id + '"]').addClass("block readOnlyLink"),
                     scope.$('td div[data-id="' + id + '"]').append(deleteButton));
@@ -106,7 +106,7 @@ define([ "require", "utils/Utils", "modules/Modal", "utils/Messages", "utils/Enu
                         fetchInputOutputValue(fetchId, defEntity), tempLink += '<div data-id="' + fetchId + '"><div class="value-loader"></div></div>';
                     }
                 }
-                readOnly ? fetch ? (fetch = !1, subLink += tempLink) : (tempLink += '<button title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
+                readOnly ? fetch ? (fetch = !1, subLink += tempLink) : (tempLink += '<button title="已删除" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
                 subLink += '<div class="block readOnlyLink">' + tempLink + "</div>") : tempLink.search("href") != -1 ? subLink += "<div>" + tempLink + "</div>" : tempLink.length && (subLink += tempLink);
             }
             return valueOfArray.length && (subLink = getArrayOfStringFormat ? getArrayOfStringFormat(valueOfArray, key) : valueOfArray.join(", ")),

+ 4 - 4
atlas/js/utils/TableLayout.js

@@ -40,11 +40,11 @@ define([ "require", "backbone", "hbs!tmpl/common/TableLayout_tmpl", "utils/Messa
             rewind: null,
             back: {
                 label: "<i class='fa fa-angle-left'></i>",
-                title: "Previous"
+                title: "前一页"
             },
             forward: {
                 label: "<i class='fa fa-angle-right'></i>",
-                title: "Next"
+                title: "下一页"
             },
             fastForward: null
         },
@@ -191,7 +191,7 @@ define([ "require", "backbone", "hbs!tmpl/common/TableLayout_tmpl", "utils/Messa
             options && options.next ? (this.pageTo = this.offset + this.limit, this.pageFrom = this.offset + 1) : !isFirstPage && options && options.previous && (this.pageTo = this.pageTo - this.limit, 
             this.pageFrom = this.pageTo - this.limit + 1), !this.isApiSorting || this.pageTo || this.pageFrom || (this.limit = this.count, 
             this.pageTo = this.offset + this.limit, this.pageFrom = this.offset + 1), this.ui.pageRecordText.html("显示  <u>" + this.collection.length + " 条记录</u> 从 " + this.pageFrom + " - " + this.pageTo),
-            this.activePage = Math.round(this.pageTo / this.limit), this.ui.activePage.attr("title", "Page " + this.activePage), 
+            this.activePage = Math.round(this.pageTo / this.limit), this.ui.activePage.attr("title", "第" + this.activePage+"页"),
             this.ui.activePage.text(this.activePage), this.ui.showPage.val(this.limit).trigger("change", {
                 skipViewChange: !0
             }), !dataLength && this.offset >= this.limit && (options && options.next || goToPage) && options && !options.fromUrl) {
@@ -227,7 +227,7 @@ define([ "require", "backbone", "hbs!tmpl/common/TableLayout_tmpl", "utils/Messa
         },
         renderFooterRecords: function(collectionState) {
             var collState = collectionState, totalRecords = collState.totalRecords || 0, pageStartIndex = totalRecords ? collState.currentPage * collState.pageSize : 0, pageEndIndex = pageStartIndex + this.collection.length;
-            return this.$('[data-id="r_footerRecords"]').html("<h5>Showing " + (totalRecords ? pageStartIndex + 1 : 0 === this.collection.length ? 0 : 1) + " - " + pageEndIndex + "</h5>"), 
+            return this.$('[data-id="r_footerRecords"]').html("<h5>显示从 " + (totalRecords ? pageStartIndex + 1 : 0 === this.collection.length ? 0 : 1) + " 到 " + pageEndIndex + "</h5>"),
             this;
         },
         renderColumnManager: function() {

+ 1 - 1
atlas/js/views/detail_page/DetailPageLayoutView.js

@@ -133,7 +133,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
                         this.description = collectionJSON.attributes.description, this.name) {
                             this.ui.title.show();
                             var titleName = "<span>" + this.name + "</span>";
-                            this.readOnly && (titleName += '<button title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i> Deleted</button>'), 
+                            this.readOnly && (titleName += '<button title="已删除" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i> Deleted</button>'),
                             this.ui.title.html(titleName), void 0 === collectionJSON.attributes.serviceType ? void 0 === Globals.serviceTypeMap[collectionJSON.typeName] && this.activeEntityDef && (Globals.serviceTypeMap[collectionJSON.typeName] = this.activeEntityDef.get("serviceType")) : void 0 === Globals.serviceTypeMap[collectionJSON.typeName] && (Globals.serviceTypeMap[collectionJSON.typeName] = collectionJSON.attributes.serviceType);
                             var entityData = _.extend({
                                 serviceType: Globals.serviceTypeMap[collectionJSON.typeName],

+ 1 - 1
atlas/js/views/entity/CreateEntityLayoutView.js

@@ -256,7 +256,7 @@ define([ "require", "backbone", "hbs!tmpl/entity/CreateEntityLayoutView_tmpl", "
         },
         getContainer: function(object) {
             var value = object.value, entityLabel = this.capitalize(_.escape(value.name));
-            return '<div class=" row ' + value.isOptional + '"><span class="col-sm-3"><label><span class="' + (value.isOptional ? "true" : "false required") + '">' + entityLabel + '</span><span class="center-block ellipsis-with-margin text-gray" title="Data Type : ' + value.typeName + '">(' + _.escape(value.typeName) + ')</span></label></span><span class="col-sm-9">' + this.getElement(object) + "</input></span></div>";
+            return '<div class=" row ' + value.isOptional + '"><span class="col-sm-3"><label><span class="' + (value.isOptional ? "true" : "false required") + '">' + entityLabel + '</span><span class="center-block ellipsis-with-margin text-gray" title="日期类型: ' + value.typeName + '">(' + _.escape(value.typeName) + ')</span></label></span><span class="col-sm-9">' + this.getElement(object) + "</input></span></div>";
         },
         getFieldElementContainer: function(object) {
             var htmlField = object.htmlField, relationshipType = (!!object.attributeType && object.attributeType, 

+ 1 - 1
atlas/js/views/entity/EntityBusinessMetaDataView.js

@@ -154,7 +154,7 @@ define([ "require", "backbone", "hbs!tmpl/entity/EntityBusinessMetaDataView_tmpl
             this.ui.businessMetadataTree.html(html);
         },
         associateAttributePanel: function(obj, tableBody) {
-            return '<div class="panel panel-default custom-panel expand_collapse_panel-icon no-border business-metadata-detail-attr"><div class="panel-heading" data-toggle="collapse" href="#' + _.escape(obj.get("__internal_UI_businessMetadataName")) + '" aria-expanded="true" style="width: 90%;"><h4 class="panel-title"> <a>' + _.escape(obj.get("__internal_UI_businessMetadataName")) + '</a></h4><div class="btn-group pull-left"> <button type="button" title="Collapse"><i class="ec-icon fa"></i></button></div></div><div id="' + _.escape(obj.get("__internal_UI_businessMetadataName")) + '" class="panel-collapse collapse in"><div class="panel-body"><table class="table bold-key">' + tableBody + "</table></div></div></div>";
+            return '<div class="panel panel-default custom-panel expand_collapse_panel-icon no-border business-metadata-detail-attr"><div class="panel-heading" data-toggle="collapse" href="#' + _.escape(obj.get("__internal_UI_businessMetadataName")) + '" aria-expanded="true" style="width: 90%;"><h4 class="panel-title"> <a>' + _.escape(obj.get("__internal_UI_businessMetadataName")) + '</a></h4><div class="btn-group pull-left"> <button type="button" title="折叠"><i class="ec-icon fa"></i></button></div></div><div id="' + _.escape(obj.get("__internal_UI_businessMetadataName")) + '" class="panel-collapse collapse in"><div class="panel-body"><table class="table bold-key">' + tableBody + "</table></div></div></div>";
         },
         onRender: function() {
             this.actualCollection && this.actualCollection.length && (this.$el.find(".panel-heading.main-parent").removeClass("collapsed").attr("aria-expanded", "true"), 

+ 3 - 3
atlas/js/views/glossary/GlossaryDetailLayoutView.js

@@ -205,20 +205,20 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryDetailLayoutView_tmpl
             var categories = "";
             _.each(data, function(val) {
                 var name = _.escape(val.displayText);
-                categories += '<span data-guid="' + val.categoryGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" data-id="categoryClick"><span>' + name + '</span><i class="fa fa-close" data-id="removeCategory" data-type="category" title="Remove Category"></i></span>';
+                categories += '<span data-guid="' + val.categoryGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" data-id="categoryClick"><span>' + name + '</span><i class="fa fa-close" data-id="removeCategory" data-type="category" title="移除类别"></i></span>';
             }), this.ui.categoryList.find("span.btn").remove(), this.ui.categoryList.prepend(categories);
         },
         generateTerm: function(data) {
             var terms = "";
             _.each(data, function(val) {
                 var name = _.escape(val.displayText);
-                terms += '<span data-guid="' + val.termGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="removeTerm" data-type="term" title="Remove Term"></i></span>';
+                terms += '<span data-guid="' + val.termGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="removeTerm" data-type="term" title="移除术语"></i></span>';
             }), this.ui.termList.find("span.btn").remove(), this.ui.termList.prepend(terms);
         },
         generateTag: function(tagObject) {
             var tagData = "";
             _.each(tagObject, function(val) {
-                tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Classification"></i></span>';
+                tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="移除分类"></i></span>';
             }), this.ui.tagList.find("span.btn").remove(), this.ui.tagList.prepend(tagData);
         },
         getCategoryTermCount: function(collection, matchString) {

+ 2 - 2
atlas/js/views/glossary/TermRelationAttributeLayoutView.js

@@ -152,9 +152,9 @@ define([ "require", "backbone", "hbs!tmpl/glossary/TermRelationAttributeLayoutVi
                 getTerms: function(key) {
                     var terms = _.map(that.data[key], function(obj) {
                         var name = _.escape(obj.displayText);
-                        return '<span data-guid="' + obj.termGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="deleteAttribute" data-attributename="' + key + '" data-termguid="' + obj.termGuid + '" data-type="term" title="Remove Term"></i></span>';
+                        return '<span data-guid="' + obj.termGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="deleteAttribute" data-attributename="' + key + '" data-termguid="' + obj.termGuid + '" data-type="term" title="移除术语"></i></span>';
                     }).join(""), attributeButtons = "";
-                    return terms.length && (attributeButtons = '<div class="btn-inline"><button type="button" title="View Attribute" class="btn btn-action btn-sm" data-attributename="' + key + '" data-id="showAttribute"><i class="fa fa-eye fa-fw" aria-hidden="true"></i></button><button type="button" title="Edit Attribute" class="btn btn-action btn-sm" data-attributename="' + key + '" data-mode="edit" data-id="showAttribute"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i></button></div>'), 
+                    return terms.length && (attributeButtons = '<div class="btn-inline"><button type="button" title="查看属性" class="btn btn-action btn-sm" data-attributename="' + key + '" data-id="showAttribute"><i class="fa fa-eye fa-fw" aria-hidden="true"></i></button><button type="button" title="修改属性" class="btn btn-action btn-sm" data-attributename="' + key + '" data-mode="edit" data-id="showAttribute"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i></button></div>'),
                     "<td>" + terms + '<button type="button" data-attributename="' + key + '" class="btn btn-action btn-sm" data-id="addTermRelation"><i class="fa fa-plus"></i></button></td><td>' + attributeButtons + "</td>";
                 }
             }));

+ 1 - 1
atlas/js/views/import/ImportLayoutView.js

@@ -72,7 +72,7 @@ define([ "require", "backbone", "hbs!tmpl/import/ImportLayoutView_tmpl", "module
                         if (success = !1, that.ui.errorDetails.empty(), Utils.defaultErrorHandler(null, file.xhr, {
                             defaultErrorMessage: response.failedImportInfoList[0].remarks
                         }), response.failedImportInfoList.length > 1) {
-                            var modalTitle = '<div class="back-button importBackBtn" title="Back to import file"><i class="fa fa-angle-left "></i> </div> <div class="modal-name">Error Details</div>';
+                            var modalTitle = '<div class="back-button importBackBtn" title="回到导入文件"><i class="fa fa-angle-left "></i> </div> <div class="modal-name">Error Details</div>';
                             _.each(response.failedImportInfoList, function(err_obj) {
                                 errorStr += "<li>" + _.escape(err_obj.remarks) + "</li>";
                             }), that.ui.errorDetails.append(errorStr), that.toggleErrorAndDropZoneView({

+ 1 - 1
atlas/js/views/schema/SchemaLayoutView.js

@@ -125,7 +125,7 @@ define([ "require", "backbone", "hbs!tmpl/schema/SchemaTableLayoutView_tmpl", "c
                             var value = _.escape(model.get("attributes")[key]);
                             if ("name" === key && model.get("guid")) {
                                 var nameHtml = '<a href="#!/detailPage/' + model.get("guid") + '">' + value + "</a>";
-                                return model.get("status") && Enums.entityStateReadOnly[model.get("status")] ? (nameHtml += '<button type="button" title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>', 
+                                return model.get("status") && Enums.entityStateReadOnly[model.get("status")] ? (nameHtml += '<button type="button" title="已删除" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
                                 '<div class="readOnly readOnlyLink">' + nameHtml + "</div>") : nameHtml;
                             }
                             return value;

+ 4 - 4
atlas/js/views/search/SearchResultLayoutView.js

@@ -267,7 +267,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                             isFirstPage ? (that.ui.previousData.attr("disabled", !0), that.pageFrom = 1, that.pageTo = that.limit) : that.ui.previousData.attr("disabled", !1),
                             options && options.next ? (that.pageTo = that.offset + that.limit, that.pageFrom = that.offset + 1) : !isFirstPage && options && options.previous && (that.pageTo = that.pageTo - that.limit,
                             that.pageFrom = that.pageTo - that.limit + 1), that.ui.pageRecordText.html("显示  <u>" + that.searchCollection.models.length + " 条记录</u> 从 " + that.pageFrom + " - " + that.pageTo),
-                            that.activePage = Math.round(that.pageTo / that.limit), that.ui.activePage.attr("title", "Page " + that.activePage),
+                            that.activePage = Math.round(that.pageTo / that.limit), that.ui.activePage.attr("title", "第" + that.activePage+"页"),
                             that.ui.activePage.text(that.activePage), that.renderTableLayoutView(), that.multiSelectEntity = [],
                             that.updateMultiSelect(), dataLength > 0 && that.$(".searchTable").removeClass("noData"),
                             Utils.getUrlState.isSearchTab() && value && !that.profileDBView) {
@@ -418,7 +418,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                             defObj && (Globals.serviceTypeMap[obj.typeName] = defObj.get("serviceType"));
                         }
                         obj.serviceType = Globals.serviceTypeMap[obj.typeName], nameHtml = obj.guid ? "-1" == obj.guid ? '<span title="' + name + '">' + name + "</span>" : '<a title="' + name + '" href="#!/detailPage/' + obj.guid + (that.fromView ? "?from=" + that.fromView : "") + '">' + name + "</a>" : '<span title="' + name + '">' + name + "</span>",
-                        obj.status && Enums.entityStateReadOnly[obj.status] && (nameHtml += '<button type="button" title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
+                        obj.status && Enums.entityStateReadOnly[obj.status] && (nameHtml += '<button type="button" title="已删除" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
                         nameHtml = '<div class="readOnly readOnlyLink">' + nameHtml + "</div>");
                         var getImageData = function(options) {
                             var imagePath = options.imagePath, returnImgUrl = null;
@@ -493,7 +493,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                 formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
                     fromRaw: function(rawValue, model) {
                         var obj = model.toJSON();
-                        if (obj && obj.typeName) return '<a title="Search ' + obj.typeName + '" href="#!/search/searchResult?query=' + obj.typeName + ' &searchType=dsl&dslChecked=true">' + obj.typeName + "</a>";
+                        if (obj && obj.typeName) return '<a title="搜索 ' + obj.typeName + '" href="#!/search/searchResult?query=' + obj.typeName + ' &searchType=dsl&dslChecked=true">' + obj.typeName + "</a>";
                     }
                 })
             }, this.getTagCol({
@@ -603,7 +603,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                                 if ("name" == key) {
                                     var nameHtml = "", name = _.escape(modelObj[key]);
                                     return nameHtml = modelObj.guid ? '<a title="' + name + '" href="#!/detailPage/' + modelObj.guid + (that.fromView ? "?from=" + that.fromView : "") + '">' + name + "</a>" : '<span title="' + name + '">' + name + "</span>",
-                                    modelObj.status && Enums.entityStateReadOnly[modelObj.status] ? (nameHtml += '<button type="button" title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
+                                    modelObj.status && Enums.entityStateReadOnly[modelObj.status] ? (nameHtml += '<button type="button" title="已删除" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>',
                                     '<div class="readOnly readOnlyLink">' + nameHtml + "</div>") : nameHtml;
                                 }
                                 if (modelObj && !_.isUndefined(modelObj[key])) {

+ 1 - 1
atlas/js/views/site/Statistics.js

@@ -146,7 +146,7 @@ define([ "require", "backbone", "hbs!tmpl/site/Statistics_tmpl", "hbs!tmpl/site/
                 var newValue = that.getValue({
                     value: value
                 });
-                "classification" === type && (newValue = "<a title=\"Search for entities associated with '" + key + '\'" class="linkClicked" href="#!/search/searchResult?searchType=basic&tag=' + key + '">' + newValue + "<a>"), 
+                "classification" === type && (newValue = "<a title=\"搜索与 '" + key + '\'关联的实体" class="linkClicked" href="#!/search/searchResult?searchType=basic&tag=' + key + '">' + newValue + "<a>"),
                 tableBody += "<tr><td>" + key + '</td><td class="">' + newValue + "</td></tr>";
             }), tableBody;
         },

+ 2 - 2
atlas/js/views/tag/TagDetailTableLayoutView.js

@@ -115,7 +115,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagDetailTableLayoutView_tmpl", "u
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
                         fromRaw: function(rawValue, model) {
                             if (that.guid !== model.get("entityGuid")) {
-                                var purgeEntityBtn = Enums.isEntityPurged[model.get("entityStatus")] ? ' title="Entity not available" disabled' : ' data-id="propagatedFromClick"', propagtedFrom = ' <span class="btn btn-action btn-sm btn-icon btn-blue" data-guid=' + model.get("entityGuid") + purgeEntityBtn + "><span> Propagated From </span></span>";
+                                var purgeEntityBtn = Enums.isEntityPurged[model.get("entityStatus")] ? ' title="实体不可用" disabled' : ' data-id="propagatedFromClick"', propagtedFrom = ' <span class="btn btn-action btn-sm btn-icon btn-blue" data-guid=' + model.get("entityGuid") + purgeEntityBtn + "><span> Propagated From </span></span>";
                                 return '<a title="" href="#!/tag/tagAttribute/' + model.get("typeName") + '">' + model.get("typeName") + "</a>" + propagtedFrom;
                             }
                             return '<a title="' + model.get("typeName") + '" href="#!/tag/tagAttribute/' + model.get("typeName") + '">' + model.get("typeName") + "</a>";
@@ -159,7 +159,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagDetailTableLayoutView_tmpl", "u
                     sortable: !1,
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
                         fromRaw: function(rawValue, model) {
-                            var deleteData = '<button title="Delete" class="btn btn-action btn-sm" data-id="delete" data-entityguid="' + model.get("entityGuid") + '" data-name="' + model.get("typeName") + '"><i class="fa fa-trash"></i></button>', editData = '<button title="Edit" class="btn btn-action btn-sm" data-id="edit" data-name="' + model.get("typeName") + '"><i class="fa fa-pencil"></i></button>';
+                            var deleteData = '<button title="删除" class="btn btn-action btn-sm" data-id="delete" data-entityguid="' + model.get("entityGuid") + '" data-name="' + model.get("typeName") + '"><i class="fa fa-trash"></i></button>', editData = '<button title="修改" class="btn btn-action btn-sm" data-id="edit" data-name="' + model.get("typeName") + '"><i class="fa fa-pencil"></i></button>';
                             return that.guid === model.get("entityGuid") ? '<div class="btn-inline">' + deleteData + editData + "</div>" : that.guid !== model.get("entityGuid") && "DELETED" === model.get("entityStatus") ? '<div class="btn-inline">' + deleteData + "</div>" : void 0;
                         }
                     })