修改bug 2023/10/12

application/admin/controller/cms/Channel.php

@@ -92,6 +92,7 @@ class Channel extends Backend
                 $modelNameArr[$v['id']] = $v['name'];
             }
             foreach ($list as $k => &$v) {
+                $v['type'] = $v['type_text'];
                 $v['pid'] = $v['parent_id'];
                 $v['model_name'] = $v['model_id'] && isset($modelNameArr[$v['model_id']]) ? $modelNameArr[$v['model_id']] : __('None');
             }

application/admin/controller/cms/Fields.php

@@ -84,7 +84,7 @@ class Fields extends Backend
                         'source'       => '-',
                         'name'         => $field['name'],
                         'title'        => $field['title'] . (isset($titles[$field['name']]) && $titles[$field['name']] != $field['title'] ? "({$titles[$field['name']]})" : ''),
-                        'type'         => $field['type'],
+                        'type'         => Config::getTypeList()[$field['type']],
                         'issystem'     => true,
                         'isfilter'     => isset($setting['filterfields']) && is_array($setting['filterfields']) && in_array($field['name'], $setting['filterfields']) ? 1 : 0,
                         'iscontribute' => isset($setting['contributefields']) && is_array($setting['contributefields']) && in_array($field['name'], $setting['contributefields']) ? 1 : 0,
@@ -100,6 +100,7 @@ class Fields extends Backend
                 $fieldList = Service::getTableFields("{$prefix}cms_" . $source);
                 $fields = [];
                 foreach ($list as $index => $item) {
+                    $item['type'] = Config::getTypeList()[$item['type']];
                     $fields[] = $item['name'];
                 }
                 foreach ($fieldList as $index => $field) {
@@ -113,7 +114,7 @@ class Fields extends Backend
                         'source'       => '-',
                         'name'         => $field['name'],
                         'title'        => $field['title'],
-                        'type'         => $field['type'],
+                        'type'         => Config::getTypeList()[$field['type']],
                         'issystem'     => true,
                         'isfilter'     => 0,
                         'iscontribute' => 0,
@@ -133,11 +134,11 @@ class Fields extends Backend
                 $setting = $diyform->setting;
                 $titles = isset($setting['titlelist']) ? $setting['titlelist'] : [];
                 $fieldList = [
-                    ['name' => 'id', 'title' => 'ID', 'type' => 'int'],
-                    ['name' => 'memo', 'title' => __('Memo'), 'type' => 'string'],
-                    ['name' => 'createtime', 'title' => __('Createtime'), 'type' => 'int'],
-                    ['name' => 'updatetime', 'title' => __('Updatetime'), 'type' => 'int'],
-                    ['name' => 'status', 'title' => __('Status'), 'type' => 'enum'],
+                    ['name' => 'id', 'title' => 'ID', 'type' => '整型'],
+                    ['name' => 'memo', 'title' => __('Memo'), 'type' => '字符串'],
+                    ['name' => 'createtime', 'title' => __('Createtime'), 'type' => '整型'],
+                    ['name' => 'updatetime', 'title' => __('Updatetime'), 'type' => '整形'],
+                    ['name' => 'status', 'title' => __('Status'), 'type' => '枚举'],
                 ];
                 foreach ($fieldList as $index => $field) {
                     $item = [
@@ -147,7 +148,7 @@ class Fields extends Backend
                         'source'       => '-',
                         'name'         => $field['name'],
                         'title'        => $field['title'] . (isset($titles[$field['name']]) && $titles[$field['name']] != $field['title'] ? "({$titles[$field['name']]})" : ''),
-                        'type'         => $field['type'],
+                        'type'         => Config::getTypeList()[$field['type']],
                         'issystem'     => true,
                         'isfilter'     => isset($setting['filterfields']) && is_array($setting['filterfields']) && in_array($field['name'], $setting['filterfields']) ? 1 : 0,
                         'iscontribute' => 0,

application/admin/controller/cms/SpecialIssue.php

@@ -45,7 +45,7 @@ class SpecialIssue extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-            $total = $this->model
+            $total = $this->model->with(['user', 'journal'])
                 ->where($where)
                 ->order($sort, $order)
                 ->count();

application/admin/lang/zh-cn/cms/conference.php

@@ -18,4 +18,20 @@ return [
     'Correct'                       => '通过',
     'Fault'                         => '拒绝',
     'Meeting Participation Details' => '参与会议详情',
+    'Image'                         => '图片',
+    'Location'                      => '地点',
+    'Web site'                      => '网站',
+    'Organizer'                     => '主办单位',
+    'Chair'                         => '主席',
+    'Start time'                    => '开始时间',
+    'Person num'                    => '人数',
+    'Topics'                        => '话题',
+    'Email'                         => '邮箱',
+    'Affiliation address'           => '附属机构地址',
+    'First name'                    => '姓',
+    'Middle name'                   => '中间名',
+    'Last name'                     => '名',
+    'Is email'                      => '是否邮箱',
+    'Is correspondsing author'      => '是否通讯作者',
+    ''
 ];

application/admin/lang/zh-cn/cms/email.php

@@ -3,6 +3,6 @@
 return [
     'User_id'                       => '用户',
     'Email'                         => '邮箱',
-    'value'                         => '输入值',
+    'value'                         => '内容',
     'Type'                          => '类型',
 ];

application/admin/lang/zh-cn/cms/fields.php

@@ -60,5 +60,12 @@ return [
     'Selectpage conditions'             => '筛选条件',
     'Field title'                       => '字段名',
     'Field value'                       => '字段值',
-    'Status'                            => '状态'
+    'Status'                            => '状态',
+    'Int'                               => '整型',
+    'Enum'                              => '枚举',
+    'Varchar'                           => '文字',
+    'Mediumint'                         => '整型(小型)',
+    'Smallint'                          => '短整型',
+    'Tinyint'                           => '整型(最小)',
+    'Bigint'                            => '整型(最大)',
 ];

application/admin/lang/zh-cn/cms/special_issue.php

@@ -2,7 +2,7 @@
 
 return [
     'User_id'                       => '用户',
-    'Journal'                       => '期刊',
+    'Journal'                       => '期刊名称',
     'Editor'                        => '作者邮箱',
     'Publication cycle'             => '出版周期',
     'Proposal text'                 => '建议文本',
@@ -11,4 +11,7 @@ return [
     'Review'                        => '未审核',
     'Correct'                       => '通过',
     'Fault'                         => '拒绝',
+    'conflict of interest declaration' => '利益冲突声明',
+    'I declare that no guest editor has a conflict of interest'  => '我声明没有任何客座编辑存在利益冲突',
+    'One or more editors have conflicts' => '一个或多个编辑器存在冲突',
 ];

application/admin/lang/zh-cn/workorder/fields.php

@@ -47,8 +47,13 @@ return [
     'Isfilter Tip'                                  => '工单管理功能内，可通过此字段进行筛选',
     'Isbasicinfo Tip'                               => '显示至前台工单详情的工单基本信息框内',
     'Fields only support alphanumeric underscores!' => '字段只支持字母数字下划线!',
-    'Field cannot start with a number!'             => '字段不能以数字开始!',
+    'Field cannot start with a number!'             => '名称不能以数字开始!',
     'This field already exists!'                    => '该字段已存在!',
     'Isformdata'                                    => '是否表单内数据显示',
     'IsAssociation'                                 => '是否关联显示',
+    'The name already exists in the main table'     => '名称已经在主表存在了',
+    'Name already exists'                           => '名称已经存在',
+    'The name already exists in the table'          => '名称已经在表中存在了',
+    'The name is a reserved field, please use a different name' => '名称为保留字段，请使用其它名称',
+    'The name is a reserved field for the model, please use a different name' => '名称为模型保留字段，请使用其它名称',
 ];

application/admin/model/cms/Fields.php

@@ -44,16 +44,16 @@ class Fields extends Model
                     throw new Exception("字段只支持字母数字下划线");
                 }
                 if (is_numeric(substr($row['name'], 0, 1))) {
-                    throw new Exception("字段不能以数字开始");
+                    throw new Exception("名称不能以数字开始!");
                 }
 
                 if ($row['source'] == 'model') {
                     $tableFields = \think\Db::name('cms_archives')->getTableFields();
                     if (in_array(strtolower($row['name']), $tableFields)) {
-                        throw new Exception("字段已经在主表存在了");
+                        throw new Exception("名称已经在主表存在了");
                     }
                     if (in_array($row['name'], ['id', 'content'])) {
-                        throw new Exception("字段已经存在");
+                        throw new Exception("名称已经存在");
                     }
                 } elseif (in_array($row['source'], ['channel', 'page', 'special', 'block'])) {
                     //栏目、单页、专题、区块需过滤主表字段
@@ -63,24 +63,24 @@ class Fields extends Model
                         return $field['name'];
                     }, collection($customFieldList)->toArray()));
                     if (in_array(strtolower($row['name']), $tableFields)) {
-                        throw new Exception("字段已经在表中存在了");
+                        throw new Exception("名称已经在表中存在了");
                     }
                 } elseif ($row['source'] == 'diyform') {
                     $tableFields = ['id', 'user_id', 'createtime', 'updatetime', 'memo', 'status'];
                     if (in_array(strtolower($row['name']), $tableFields)) {
-                        throw new Exception("字段已经存在");
+                        throw new Exception("名称已经存在");
                     }
                 } else {
                     $tableFields = ['id', 'user_id', 'type', 'createtime', 'updatetime'];
                     if (in_array(strtolower($row['name']), $tableFields)) {
-                        throw new Exception("字段为保留字段，请使用其它字段");
+                        throw new Exception("名称为保留字段，请使用其它名称");
                     }
                 }
                 $vars = array_keys(get_class_vars('\think\Model'));
                 $vars = array_map('strtolower', $vars);
                 $vars = array_merge($vars, ['url', 'fullurl']);
                 if (in_array(strtolower($row['name']), $vars)) {
-                    throw new Exception("字段为模型保留字段，请使用其它字段");
+                    throw new Exception("名称为模型保留字段，请使用其它名称");
                 }
             }
         };

application/admin/view/cms/channel/add.html

@@ -3,10 +3,9 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
-
             <div class="radio">
                 {foreach name="typeList" item="vo"}
-                <label for="row[type]-{$key}"><input id="row[type]-{$key}" name="row[type]" type="radio" value="{$key}" {in name="key" value="list" }checked{/in} /> {$vo}</label>
+                <label for="row[type]-{$key}"><input id="row[type]-{$key}" name="row[type]" type="radio" value="" {if input('type')==$key }checked {/if}/> {$vo}</label>
                 {/foreach}
             </div>
         </div>

application/admin/view/cms/conference/edit.html

@@ -14,83 +14,77 @@
         </div>
     </div>
     <div class="form-group">
-        <label for="c-title" class="control-label col-xs-12 col-sm-2">Title:</label>
+        <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[title]" id="c-title" value="{$row.title}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-location" class="control-label col-xs-12 col-sm-2">Location:</label>
+        <label for="c-location" class="control-label col-xs-12 col-sm-2">{:__('Location')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[title]" id="c-location" value="{$row.location}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-web_site" class="control-label col-xs-12 col-sm-2">Web site:</label>
+        <label for="c-web_site" class="control-label col-xs-12 col-sm-2">{:__('Web site')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[web_site]" id="c-web_site" value="{$row.web_site}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-organizer" class="control-label col-xs-12 col-sm-2">Organizer:</label>
+        <label for="c-organizer" class="control-label col-xs-12 col-sm-2">{:__('Organizer')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[organizer]" id="c-organizer" value="{$row.organizer}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-chair" class="control-label col-xs-12 col-sm-2">Chair:</label>
+        <label for="c-chair" class="control-label col-xs-12 col-sm-2">{:__('Chair')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[chair]" id="c-chair" value="{$row.chair}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-start_time" class="control-label col-xs-12 col-sm-2">Start time:</label>
+        <label for="c-start_time" class="control-label col-xs-12 col-sm-2">{:__('Start time')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input class="admin form-control datetimepicker" id="c-start_time" readonly
                    data-date-format="YYYY-MM-DD"
-                   data-date-use-current="true"
-                   data-date-min-date="now"
-                   data-rule="required"
                    type="text" name="row[start_time]" value="{$row.start_time}"/>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-end_time" class="control-label col-xs-12 col-sm-2">End time:</label>
+        <label for="c-end_time" class="control-label col-xs-12 col-sm-2">{:__('End time')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input class="admin form-control datetimepicker" id="c-end_time" readonly
                    data-date-format="YYYY-MM-DD"
-                   data-date-use-current="true"
-                   data-date-min-date="now"
-                   data-rule="required"
                    type="text" name="row[start_time]" value="{$row.end_time}"/>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-person_num" class="control-label col-xs-12 col-sm-2">Person num:</label>
+        <label for="c-person_num" class="control-label col-xs-12 col-sm-2">{:__('Person num')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[person_num]" id="c-person_num" value="{$row.person_num}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-topics" class="control-label col-xs-12 col-sm-2">Topics:</label>
+        <label for="c-topics" class="control-label col-xs-12 col-sm-2">{:__('Topics')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[topics]" id="c-topics" value="{$row.topics}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-name" class="control-label col-xs-12 col-sm-2">Name:</label>
+        <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[name]" id="c-name" value="{$row.name}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-email" class="control-label col-xs-12 col-sm-2">Email:</label>
+        <label for="c-email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[email]" id="c-email" value="{$row.email}" readonly>
         </div>
     </div>
     <div class="form-group">
-        <label for="c-affiliation_address" class="control-label col-xs-12 col-sm-2">Affiliation address:</label>
+        <label for="c-affiliation_address" class="control-label col-xs-12 col-sm-2">{:__('Affiliation address')}:</label>
         <div class="col-xs-12 col-sm-7">
             <input type="text" class="form-control" name="row[affiliation_address]" id="c-affiliation_address" value="{$row.affiliation_address}" readonly>
         </div>

application/admin/view/cms/email/edit.html

@@ -1,98 +1,8 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-    <div class="form-group" data-field="image">
-        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image}" readonly>
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-image"></span>
-            </div>
-            <ul class="row list-inline plupload-preview" id="p-image"></ul>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-title" class="control-label col-xs-12 col-sm-2">Title:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[title]" id="c-title" value="{$row.title}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-location" class="control-label col-xs-12 col-sm-2">Location:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[title]" id="c-location" value="{$row.location}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-web_site" class="control-label col-xs-12 col-sm-2">Web site:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[web_site]" id="c-web_site" value="{$row.web_site}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-organizer" class="control-label col-xs-12 col-sm-2">Organizer:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[organizer]" id="c-organizer" value="{$row.organizer}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-chair" class="control-label col-xs-12 col-sm-2">Chair:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[chair]" id="c-chair" value="{$row.chair}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-start_time" class="control-label col-xs-12 col-sm-2">Start time:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input class="admin form-control datetimepicker" id="c-start_time" readonly
-                   data-date-format="YYYY-MM-DD"
-                   data-date-use-current="true"
-                   data-date-min-date="now"
-                   data-rule="required"
-                   type="text" name="row[start_time]" value="{$row.start_time}"/>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-end_time" class="control-label col-xs-12 col-sm-2">End time:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input class="admin form-control datetimepicker" id="c-end_time" readonly
-                   data-date-format="YYYY-MM-DD"
-                   data-date-use-current="true"
-                   data-date-min-date="now"
-                   data-rule="required"
-                   type="text" name="row[start_time]" value="{$row.end_time}"/>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-person_num" class="control-label col-xs-12 col-sm-2">Person num:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[person_num]" id="c-person_num" value="{$row.person_num}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-topics" class="control-label col-xs-12 col-sm-2">Topics:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[topics]" id="c-topics" value="{$row.topics}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-name" class="control-label col-xs-12 col-sm-2">Name:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[name]" id="c-name" value="{$row.name}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-email" class="control-label col-xs-12 col-sm-2">Email:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[email]" id="c-email" value="{$row.email}" readonly>
-        </div>
-    </div>
     <div class="form-group">
-        <label for="c-affiliation_address" class="control-label col-xs-12 col-sm-2">Affiliation address:</label>
+        <label for="c-value" class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
         <div class="col-xs-12 col-sm-7">
-            <input type="text" class="form-control" name="row[affiliation_address]" id="c-affiliation_address" value="{$row.affiliation_address}" readonly>
+            <textarea id="c-value" class="form-control editor" name="row[value]" rows="15" placeholder="">{$row.value|htmlentities}</textarea>
         </div>
     </div>
 

application/admin/view/cms/fields/index.html

@@ -17,13 +17,6 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh,add,edit,del')}
-                        <div class="dropdown btn-group {:$auth->check('cms/fields/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
-                            </ul>
-                        </div>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-edit="{:$auth->check('cms/fields/edit')}"

application/admin/view/cms/special_issue/edit.html

@@ -1,6 +1,6 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <div class="form-group">
-        <label for="c-journal" class="control-label col-xs-12 col-sm-2">{:__('Journal')}:</label>
+        <label for="c-journal" class="control-label col-xs-12 col-sm-2">{:__('Journal')}：</label>
         <div class="col-xs-12 col-sm-7">
             <select id="c-journal" data-rule="required" class="form-control" name="row[journal]">
                 <option value="">Please select</option>
@@ -60,11 +60,12 @@
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">
-            conflict of interest declaration
+            {:__('conflict of interest declaration')}
         </label>
         <div class="col-xs-12 col-sm-7">
-            <label for="statement-type-yes"><input id="statement-type-yes" name="row[statement_type]" type="radio" value="yes" {if condition="$row.statement_type == 'yes'"}checked{/if} />I declare that no guest editor has a conflict of interest</label>
-            <label for="statement-type-no"><input id="statement-type-no" name="row[statement_type]" type="radio" value="no" {if condition="$row.statement_type == 'no'"}checked{/if} />One or more editors have conflicts </label>
+            <label for="statement-type-yes"><input id="statement-type-yes" name="row[statement_type]" type="radio" value="yes" {if condition="$row.statement_type == 'yes'"}checked{/if} />{:__('I declare that no guest editor has a conflict of interest')}</label>
+            <br>
+            <label for="statement-type-no"><input id="statement-type-no" name="row[statement_type]" type="radio" value="no" {if condition="$row.statement_type == 'no'"}checked{/if} />{:__('One or more editors have conflicts')} </label>
         </div>
     </div>
 

application/common/model/Config.php

@@ -55,6 +55,13 @@ class Config extends Model
             'selectpages'   => __('Selectpages'),
             'array'         => __('Array'),
             'custom'        => __('Custom'),
+            'int'           => __('Int'),
+            'enum'          => __('Enum'),
+            'varchar'       => __('Varchar'),
+            'mediumint'     => __('Mediumint'),
+            'smallint'      => __('Smallint'),
+            'tinyint'       => __('Tinyint'),
+            'bigint'        => __('Bigint'),
         ];
         return $typeList;
     }

public/assets/js/backend/cms/archives.js

@@ -45,6 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
                 searchFormVisible: Fast.api.query("model_id") ? true : false,
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/autolink.js

@@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'weigh',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/block.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'weigh',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/channel.js

@@ -29,6 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 escape: false,
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},
@@ -99,7 +100,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             addclass: 'datetimerange',
                             formatter: Table.api.formatter.datetime
                         },
-                        {field: 'iscontribute', title: __('Iscontribute'), searchList: {"1": __('Yes'), "0": __('No')}, formatter: Table.api.formatter.toggle},
+                        // {field: 'iscontribute', title: __('Iscontribute'), searchList: {"1": __('Yes'), "0": __('No')}, formatter: Table.api.formatter.toggle},
                         {field: 'isnav', title: __('Isnav'), searchList: {"1": __('Yes'), "0": __('No')}, formatter: Table.api.formatter.toggle},
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
                         {
@@ -122,7 +123,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     text: '添加子栏目',
                                     classname: 'btn btn-info btn-xs btn-dialog',
                                     icon: 'fa fa-plus',
-                                    url: 'cms/channel/add/parent_id/{ids}'
+                                    url: 'cms/channel/add/parent_id/{ids}/type/{type}'
                                 },
                                 {
                                     name: 'editor',

public/assets/js/backend/cms/comment.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/conference.js

@@ -26,23 +26,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'user.nickname', title: __('Nickname'), operate: false},
-                        {field: 'title', title: __('Title'), formatter: Table.api.formatter.search, operate: 'like'},
+                        {field: 'title', title: __('Title'), operate: 'like'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'location', title: __('Location'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'web_site', title: __('Web site'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'chair', title: __('Chair'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'start_time', title: __('Start time'), sortable: true, operate: 'RANGE', addclass: 'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'end_time', title: __('End time'), sortable: true, operate: 'RANGE', addclass: 'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'person_num', title: __('Person num'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'topics', title: __('Topics'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'name', title: __('Name'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'email', title: __('Email'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'affiliation_address', title: __('Affiliation address'), formatter: Table.api.formatter.search, operate: 'like'},
+                        {field: 'location', title: __('Location'), operate: 'like'},
+                        {field: 'web_site', title: __('Web site'), operate: 'like'},
+                        {field: 'chair', title: __('Chair'), operate: 'like'},
+                        {field: 'start_time', title: __('Start time'), sortable: true, operate: 'RANGE', addclass: 'datetimerange', datetimeFormat: "YYYY-MM-DD", formatter: Table.api.formatter.datetime},
+                        {field: 'end_time', title: __('End time'), sortable: true, operate: 'RANGE', addclass: 'datetimerange', datetimeFormat: "YYYY-MM-DD", formatter: Table.api.formatter.datetime},
+                        {field: 'person_num', title: __('Person num'), operate: 'like'},
+                        {field: 'topics', title: __('Topics'), operate: 'like'},
+                        {field: 'name', title: __('Name'), operate: 'like'},
+                        {field: 'email', title: __('Email'), operate: 'like'},
+                        {field: 'affiliation_address', title: __('Affiliation address'), operate: 'like'},
                         {field: 'status', title: __('Status'), searchList: {"review": __('Review'), "Fault": __('Fault'), "Correct": __('Correct')}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), sortable: true, operate: 'RANGE', addclass: 'datetimerange', formatter: Table.api.formatter.datetime},
                         {
@@ -137,20 +138,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'user.nickname', title: __('Nickname'), operate: false},
-                        {field: 'conference.title', title: __('Title'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'email', title: __('Email'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'first_name', title: __('First name'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'middle_name', title: __('Middle name'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'last_name', title: __('Last name'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'is_email', title: __('Is email'), searchList: {"yes": __('Yes'), "no": __('No')}},
-                        {field: 'is_correspondsing_author', title: __('Is correspondsing author'), searchList: {"yes": __('Yes'), "no": __('No')}},
-                        {field: 'affiliation', title: __('Affiliation'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'country', title: __('Country'), formatter: Table.api.formatter.search, operate: 'like'},
+                        {field: 'conference.title', title: __('Title'), operate: 'like'},
+                        {field: 'email', title: __('Email'), operate: 'like'},
+                        {field: 'first_name', title: __('First name'), operate: 'like'},
+                        {field: 'middle_name', title: __('Middle name'), operate: 'like'},
+                        {field: 'last_name', title: __('Last name'), operate: 'like'},
+                        {field: 'is_email', title: __('Is email'), searchList: {"yes": __('Yes'), "no": __('No')}, formatter: Table.api.formatter.status},
+                        {field: 'is_correspondsing_author', title: __('Is correspondsing author'), searchList: {"yes": __('Yes'), "no": __('No')}, formatter: Table.api.formatter.status},
+                        {field: 'affiliation', title: __('Affiliation'), operate: 'like'},
+                        {field: 'country', title: __('Country'), operate: 'like'},
                         {field: 'createtime', title: __('Createtime'), sortable: true, operate: 'RANGE', addclass: 'datetimerange', formatter: Table.api.formatter.datetime},
                     ]
                 ]

public/assets/js/backend/cms/diyform.js

@@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/email.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/fields.js

@@ -13,6 +13,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     edit_url: 'cms/fields/edit' + Config.params,
                     del_url: 'cms/fields/del' + Config.params,
                     multi_url: 'cms/fields/multi' + Config.params,
+                    dragsort_url: "",
                     table: 'cms_fields',
                 }
             });

public/assets/js/backend/cms/manuscript.js

@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/manuscript_log.js

@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/modelx.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 2,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/order.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/page.js

@@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/search_log.js

@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/special.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/special_issue.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/spider_log.js

@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/cms/tag.js

@@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/protocol.js

@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {field: 'id', title: __('Id'),operate:false},

public/assets/js/backend/user/role_log.js

@@ -17,6 +17,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/user/user.js

@@ -21,6 +21,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'user.id',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},

public/assets/js/backend/workorder/fields.js

@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
+                exportTypes: ['excel'],
                 columns: [
                     [
                         {checkbox: true},