Repository: kylin Updated Branches: refs/heads/KYLIN-2462 [created] 7eb0e054c
KYLIN 1875 update add data model Signed-off-by: Li Yang <liy...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fa18b11b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fa18b11b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fa18b11b Branch: refs/heads/KYLIN-2462 Commit: fa18b11bb76353744a37a86510934ca84858e763 Parents: 37aab3c Author: chenzhx <346839...@qq.com> Authored: Thu Feb 23 17:55:23 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Feb 23 18:29:31 2017 +0800 ---------------------------------------------------------------------- .../app/partials/modelDesigner/data_model.html | 48 ++++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fa18b11b/webapp/app/partials/modelDesigner/data_model.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/modelDesigner/data_model.html b/webapp/app/partials/modelDesigner/data_model.html index d6a6023..9b7070c 100644 --- a/webapp/app/partials/modelDesigner/data_model.html +++ b/webapp/app/partials/modelDesigner/data_model.html @@ -130,47 +130,45 @@ <ng-form name="lookup_form"> <div class="form-group"> <div class="row"> - <div class="col-xs-12"> - <div> - <select chosen ng-model="newLookup.joinTable" class="col-sm-4" + <div class="col-xs-12 form-group"> + <select chosen ng-model="newLookup.joinTable" class="chosen-select col-sm-5" ng-options="table as table for table in aliasName" name="table_name" ng-disabled="lookupState.editing" - ng-required="true" - class="chosen-select"> + ng-required="true"> <option value=""> -- From Table -- </option> </select> + </div> + </div> + <div class="row"> + <div class="col-xs-12 form-group"> <!--Join Type--> - <select class="form-control" chosen ng-init="newLookup.join.type='inner'" ng-model="newLookup.join.type" style="width:120px;" - ng-options="joinType.value as joinType.name for joinType in cubeConfig.joinTypes"> + <select class="chosen-select col-sm-5" chosen ng-init="newLookup.join.type='inner'" ng-model="newLookup.join.type" + ng-options="joinType.value as joinType.name+' Join' for joinType in cubeConfig.joinTypes"> <option value=""></option> </select> - <label class="control-label font-color-default"><b>Join</b></label> - <select chosen ng-model="newLookup.table" class="col-sm-4" + </div> + </div> + <div class="row"> + <div class="col-xs-12 form-group"> + <select chosen ng-model="newLookup.table" class="chosen-select col-sm-5" ng-options="table.name as VdmUtil.removeNameSpace(table.name) for table in tableModel.selectProjectTables" name="table_name" ng-disabled="lookupState.editing" - ng-required="true" ng-change="changeJoinTable()" - class="chosen-select"> + ng-required="true" ng-change="changeJoinTable()"> <option value=""> -- Select Lookup Table -- </option> </select> - </div> + <div class="chosen-select col-sm-6" style="float:right;padding-left:0;"> + <input type="text" class="form-control " name="joinTable_alias" placeholder="Input Table Alias" ng-required="true" + ng-model="newLookup.alias" ng-pattern="/^[A-Z_\d]+$/"> + <small class="help-block red" ng-show="!lookup_form.joinTable_alias.$error.required&&lookup_form.joinTable_alias.$invalid && (lookup_form.joinTable_alias.$dirty||lookup_form.$submitted)"><i class="fa fa-exclamation-triangle"></i> Table alias is invalid(A Combination of numbers, uppercase letters or underscores).</small> + </div> + <span class="col-sm-1 font-color-default" style="float:right;font-size:large;line-height: 30px;"><b>AS</b></span> </div> </div> </div> - <div class="form-group"> - <div class="row"> - <label class="col-sm-6 control-label font-color-default" ><b style="float:right">Table Alias :</b></label> - <div class="col-sm-5"> - <input type="text" class="form-control " name="joinTable_alias" placeholder="Input Table Alias" ng-required="true" - ng-model="newLookup.alias" ng-pattern="/^[A-Z_\d]+$/"> - <small class="help-block red" ng-show="!lookup_form.joinTable_alias.$error.required&&lookup_form.joinTable_alias.$invalid && (lookup_form.joinTable_alias.$dirty||lookup_form.$submitted)"><i class="fa fa-exclamation-triangle"></i> Table alias is invalid(A Combination of numbers, uppercase letters or underscores).</small> - </div> - </div> - </div> <!--Table Type--> - <div class="form-group"> + <div class="form-group form-group middle-popover"> <div class="row"> - <label class="col-sm-6"></label> - <div class="col-sm-5"> + <div class="col-sm-5" > <label> <input type="checkbox" ng-model="newLookup.kind" ng-true-value="FACT" ng-false-value="LOOKUP" > Is Limited </label>
