appadmin block 调整

app/appadmin/modules/AppadminbaseBlock.php

@@ -529,6 +529,7 @@ class AppadminbaseBlock extends BaseObject
             foreach ($fields as $field) {
                 $orderField = $field['orderField'];
                 $display = $field['display'];
+                $translate = $field['translate'];
                 $val = $one[$orderField];
                 $display_title = '';
                 if ($val) {
@@ -583,6 +584,9 @@ class AppadminbaseBlock extends BaseObject
                         $val = Yii::$service->fecshoplang->getDefaultLangAttrVal($val, $orderField);
                     }
                 }
+                if ($translate) {
+                    $val = Yii::$service->page->translate->__($val);
+                }
                 $str .= '<td><span title="'.$display_title.'">'.$val.'</span></td>';
             }
             $str .= '<td>

app/appadmin/modules/AppadminbaseBlockEdit.php

@@ -45,12 +45,11 @@ class AppadminbaseBlockEdit extends BaseObject
         $this->_param = CRequest::param();
         $this->_primaryKey = $this->_service->getPrimaryKey();
         $id = $this->_param[$this->_primaryKey];
-
         $this->_one = $this->_service->getByPrimaryKey($id);
     }
     
-    public function getVal($name, $column){
-        
+    public function getVal($name, $column)
+    {
         return ($this->_one[$name] || $this->_one[$name] === 0) ? $this->_one[$name] : $column['default'];
     }  
 
@@ -91,8 +90,8 @@ EOF;
                 $display = ['type' => 'inputString'];
             }
             //var_dump($this->_one['id']);
-            $value = $this->getVal($name, $column);
             
+            $value = $this->getVal($name, $column);
             $display_type = isset($display['type']) ? $display['type'] : 'inputString';
             if ($display_type == 'inputString') {
                 $isLang = isset($display['lang']) ? $display['lang'] : false;
@@ -204,7 +203,7 @@ EOF;
                 $select_str = '';
                 if (is_array($data)) {
                     $select_str .= <<<EOF
-								<select class="combox {$require}" name="{$this->_editFormData}[{$name}]" >
+								<select class="select_{$name} combox {$require}" name="{$this->_editFormData}[{$name}]" >
 EOF;
                     $select_str .= '<option value="">'.$label.'</option>';
                     foreach ($data as $k => $v) {
@@ -266,6 +265,11 @@ EOF;
                         </script>
 EOF;
             } elseif ($display_type == 'textarea') {
+                $notEditor = isset($display['notEditor']) ? $display['notEditor'] : false;
+                $edittorClass='editor';
+                if ($notEditor) {
+                    $edittorClass='';
+                }
                 $rows = isset($display['rows']) ? $display['rows'] : 15;
                 $cols = isset($display['cols']) ? $display['cols'] : 110;
                 $isLang = isset($display['lang']) ? $display['lang'] : false;
@@ -292,7 +296,7 @@ EOF;
 								<legend style="color:#009688">'.$label.'['.$lang.']：</legend>
 								<div>
 									<div class="unit">
-										<textarea '.$uploadImgUrl.' '.$uploadFlashUrl.'  '.$uploadLinkUrl.'  '.$uploadMediaUrl.'  class="editor '.$inputStringLangRequire.'"  rows="'.$rows.'" cols="'.$cols.'" name="'.$this->_editFormData.'['.$name.']['.$langAttrName.']" >'.$value[$langAttrName].'</textarea>
+										<textarea '.$uploadImgUrl.' '.$uploadFlashUrl.'  '.$uploadLinkUrl.'  '.$uploadMediaUrl.'  class="'.$edittorClass.' '.$inputStringLangRequire.'"  rows="'.$rows.'" cols="'.$cols.'" name="'.$this->_editFormData.'['.$name.']['.$langAttrName.']" >'.$value[$langAttrName].'</textarea>
 									</div>
 								</div>
 							</fieldset>
@@ -321,7 +325,7 @@ EOF;
 						<fieldset id="fieldset_table_qbe">
 							<legend style="color:#009688">{$label}：</legend>
 							<div>
-								<textarea  class="editor" name="{$this->_editFormData}[{$name}]" rows="{$rows}" cols="{$cols}" name="{$this->_editFormData}[{$name}]"  {$uploadImgUrl}  {$uploadFlashUrl}  {$uploadLinkUrl}   {$uploadMediaUrl} >{$value}</textarea>
+								<textarea  class="{$edittorClass}" name="{$this->_editFormData}[{$name}]" rows="{$rows}" cols="{$cols}" name="{$this->_editFormData}[{$name}]"  {$uploadImgUrl}  {$uploadFlashUrl}  {$uploadLinkUrl}   {$uploadMediaUrl} >{$value}</textarea>
                                 <span class="remark-text">{$remark}</span>
                             </div>
 						</fieldset>