5 Commits 9aa879c6f4 ... 2f07b67b65

Author SHA1 Message Date
  zlSun 2f07b67b65 筛选器初步修改 1 year ago
  zlSun 38c186d2f2 搜索页面中文优化 1 year ago
  zlSun 495d4f4ed5 创建实体页面的placeholder修改 1 year ago
  zlSun 347e561553 修改 span.required:after的css,让中文可以正常显示 1 year ago
  zlSun 5fc450ae4c 修改建表时的中文翻译 1 year ago

File diff suppressed because it is too large
+ 0 - 0
atlas/css/migration-style.css


File diff suppressed because it is too large
+ 0 - 0
atlas/css/style.css


File diff suppressed because it is too large
+ 0 - 0
atlas/js/libs/select2/select2.full.min.js


+ 1 - 1
atlas/js/templates/search/SearchResultLayoutView_tmpl.html

@@ -72,7 +72,7 @@
                 <div class="entityLink" style="display:none">
                     <p class="entityLink">搜索实体
                         {{#if entityCreate}}
-                        or
+                        或者
                         <a href="javascript:void(0)" data-id='createEntity'> 创建新实体 </a>
                         {{/if}}
                     </p>

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

@@ -255,12 +255,12 @@ define([ "require", "backbone", "hbs!tmpl/entity/CreateEntityLayoutView_tmpl", "
             });
         },
         getContainer: function(object) {
-            var value = object.value, entityLabel = this.capitalize(_.escape(value.name));
+            var value = object.value, entityLabel = Utils.toChinese(_.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="类型: ' + 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,
-            !!object.relationshipType && object.relationshipType), alloptional = object.alloptional, typeOfDefination = relationshipType ? "Relationships" : "Attributes";
+            !!object.relationshipType && object.relationshipType), alloptional = object.alloptional, typeOfDefination = relationshipType ? "关联" : "属性";
             return '<div class="attribute-dash-box ' + (alloptional ? "alloptional" : "") + ' "><span class="attribute-type-label">' + typeOfDefination + "</span>" + htmlField + "</div>";
         },
         getSelect: function(object) {
@@ -278,11 +278,11 @@ define([ "require", "backbone", "hbs!tmpl/entity/CreateEntityLayoutView_tmpl", "
                     _.isObject(parseValue) && !_.isArray(parseValue) && parseValue.attributes && (setValue = JSON.stringify(parseValue.attributes));
                 }
             } catch (err) {}
-            return '<textarea class="form-control entityInputBox ' + (value.isOptional === !0 ? "false" : "true") + '" data-type="' + value.typeName + '" data-key="' + name + '" data-attribute="' + isAttribute + '" data-relation="' + isRelation + '" placeholder="' + name + '" data-id="entityInput">' + setValue + "</textarea>";
+            return '<textarea class="form-control entityInputBox ' + (value.isOptional === !0 ? "false" : "true") + '" data-type="' + value.typeName + '" data-key="' + name + '" data-attribute="' + isAttribute + '" data-relation="' + isRelation + '" placeholder="' + Utils.toChinese(name)  + '" data-id="entityInput">' + setValue + "</textarea>";
         },
         getInput: function(object) {
             var value = object.value, name = _.escape(value.name), entityValue = _.escape(object.entityValue), isAttribute = object.isAttribute, isRelation = object.isRelation;
-            return '<input class="form-control entityInputBox ' + (value.isOptional === !0 ? "false" : "true") + '" data-type="' + value.typeName + '" value="' + entityValue + '" data-key="' + name + '" data-attribute="' + isAttribute + '" data-relation="' + isRelation + '" placeholder="' + name + '" name="' + name + '" data-id="entityInput">';
+            return '<input class="form-control entityInputBox ' + (value.isOptional === !0 ? "false" : "true") + '" data-type="' + value.typeName + '" value="' + entityValue + '" data-key="' + name + '" data-attribute="' + isAttribute + '" data-relation="' + isRelation + '" placeholder="' + Utils.toChinese(name) + '" name="' + name + '" data-id="entityInput">';
         },
         getElement: function(object) {
             var value = object.value, isAttribute = object.isAttribute, isRelation = object.isRelation, typeName = value.typeName, entityValue = "";

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

@@ -357,11 +357,11 @@ define([ "require", "backbone", "hbs!tmpl/search/QueryBuilder_tmpl", "hbs!tmpl/s
                         apply_to: [ "date" ]
                     } ],
                     lang: {
-                        add_rule: "Add filter",
-                        add_group: "Add filter group",
+                        add_rule: "添加筛选器",
+                        add_group: "添加筛选器组",
                         operators: {
-                            not_null: "is not null",
-                            TIME_RANGE: "Time Range"
+                            not_null: "是非空的",
+                            TIME_RANGE: "时间范围"
                         }
                     },
                     icons: {

+ 2 - 2
atlas/js/views/search/SearchLayoutView.js

@@ -504,8 +504,8 @@ define([ "require", "backbone", "hbs!tmpl/search/SearchLayoutView_tmpl", "utils/
                 // this.ui.searchInput.attr("placeholder", 'Search By Query eg. where name="sales_fact"')) : (this.$(".typeFilter").addClass("col-sm-10"),
                 this.ui.searchInput.attr("placeholder", '根据查询搜索,例如:where name="sales_fact"')) : (this.$(".typeFilter").addClass("col-sm-10"),
             this.$(".typeFilter").removeClass("col-sm-12"), this.$(".typeFilterBtn,.tagBox,.termBox,.basicSaveSearch").show(),
-            this.$(".advanceSaveSearch").hide(), this.dsl = !1, this.type = "basic", this.$(".searchText").text("根据文本修改"),
-            this.ui.searchInput.attr("placeholder", "根据文本修改")), Utils.getUrlState.isSearchTab() && Utils.setUrl({
+            this.$(".advanceSaveSearch").hide(), this.dsl = !1, this.type = "basic", this.$(".searchText").text("根据语句搜索"),
+            this.ui.searchInput.attr("placeholder", "根据语句搜索")), Utils.getUrlState.isSearchTab() && Utils.setUrl({
                 url: "#!/search/searchResult",
                 urlParams: _.extend(this.query[this.type], {
                     searchType: this.type,

+ 7 - 7
atlas/js/views/search/SearchQueryView.js

@@ -15,23 +15,23 @@ define([ "require", "backbone", "modules/Modal", "utils/Utils", "hbs!tmpl/search
             this.bindEvents();
             var that = this;
             this.modal = new Modal({
-                title: "Attribute Filter",
+                title: "属性筛选器",
                 content: this,
                 allowCancel: !0,
                 mainClass: "modal-lg",
                 okCloses: !1,
                 buttons: [ {
-                    text: "Cancel",
+                    text: "取消",
                     btnClass: "cancel btn-action",
-                    title: "Cancel"
+                    title: "取消"
                 }, {
-                    text: "Apply",
+                    text: "应用",
                     btnClass: "ok btn-atlas",
-                    title: "Apply the filters and close popup (won't perform search)"
+                    title: "应用过滤器并关闭弹出窗口(不会执行搜索)"
                 }, {
-                    text: "Search",
+                    text: "搜索",
                     btnClass: "ok search btn-atlas",
-                    title: "Apply the filters and do search"
+                    title: "应用筛选器并进行搜索"
                 } ]
             }).open(), this.modal.on("closeModal", function() {
                 that.modal.trigger("cancel");

Some files were not shown because too many files changed in this diff