Explorar el Código

Merge branch 'fix/Query.table_rename' into 'develop'

Merge of fix/[数据管理]数据表和别名在build以后不允许修改 to develop

See merge request o2oa/o2oa!1045
蔡祥熠 hace 5 años
padre
commit
1bad4e0639

+ 3 - 3
o2web/source/x_component_Selector/Person.js

@@ -1749,9 +1749,9 @@ MWF.xApplication.Selector.Person.Item = new Class({
         if( ( this.selector.options.count.toInt() === 1 || this.selector.options.noSelectedContainer ) && this.selector.css.selectorItemActionNode_single_selected  ){
             this.actionNode.setStyles( this.selector.css.selectorItemActionNode_single_selected );
         }
-        if( this.category ){
-            this.category.checkSelectAll();
-        }
+        // if( this.category ){
+        //     this.category.checkSelectAll();
+        // }
     },
     setEvent: function(){
         this.node.addEvents({

+ 8 - 2
o2web/source/x_component_query_TableDesigner/$Table/table.html

@@ -7,11 +7,17 @@
             </tr>
             <tr>
                 <td class="editTableTitle">名称:</td>
-                <td class="editTableValue"><input type="text" name="name" value="text{$.name}" class="editTableInput"/></td>
+                <td class="editTableValue">
+                    <input type="text" name="name" value="text{$.name}" class="editTableInput" style="display: text{($.status=='build')?'none':''}"/>
+                    <div style="display: text{($.status=='build')?'':'none'}">text{$.name}</div>
+                </td>
             </tr>
             <tr>
                 <td class="editTableTitle">别名:</td>
-                <td class="editTableValue"><input type="text" name="alias" value="text{$.alias}" class="editTableInput"/></td>
+                <td class="editTableValue">
+                    <input type="text" name="alias" value="text{$.alias}" class="editTableInput" style="display: text{($.status=='build')?'none':''}"/>
+                    <div style="display: text{($.status=='build')?'':'none'}">text{$.alias}</div>
+                </td>
             </tr>
             <tr>
                 <td class="editTableTitle">描述:</td>