mooho-base-admin-plus 2.3.13 → 2.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.3.13",
+  "version": "2.4.0",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/table-setting.vue

@@ -105,6 +105,22 @@
             {{ $t('Front_Btn_Condition') }}
           </Button>
         </div>
+        <div v-if="code == 'showEnable'">
+          <Switch
+            :model-value="!!data.showEnable"
+            v-if="showCheck(data.showEnableJson)"
+            @update:model-value="
+              $event => {
+                data.showEnable = $event;
+                //$forceUpdate();
+              }
+            "
+            @on-change="checkChange('showEnableJson', 'showEnable')"
+          />
+          <Button style="margin-left: 8px" @click="$refs.conditionEdit.open(data, 'showEnableJson', 'showEnable', dataView.model)" type="primary" size="small" icon="ios-settings">
+            {{ $t('Front_Btn_Condition') }}
+          </Button>
+        </div>
         <div v-if="code == 'removeEnable'">
           <Switch
             :model-value="!!data.removeEnable"

package/src/components/view/view-table.vue

@@ -39,12 +39,14 @@
                 <slot name="filterColumn" :column="column" :code="column.code"></slot>
               </template>
             </table-filter>
-            <Col v-bind="getGrid(tableView.filterWidth)" :style="{ 'text-align': tableView.filterAlign == null ? 'left' : tableView.filterAlign.toLowerCase() }">
+            <Col v-bind="getGrid(tableView.filterWidth)" :style="{ 'text-align': !(tableView.filterAlign || '').trim() ? 'left' : tableView.filterAlign.toLowerCase() }">
               <FormItem :label-width="0">
                 <Button type="info" v-if="tableView.keywordEnable || filterColumns.length > 0" custom-icon="fa fa-search" @click="search()" size="small">
                   {{ $t('Front_Btn_Search') }}
                 </Button>
-                <Button type="primary" v-if="tableView.createEnable && createEnable" custom-icon="fa fa-plus" @click="create()" size="small">{{ $t('Front_Btn_New') }}</Button>
+                <Button type="primary" v-if="tableView.createEnable && createEnable && !readonly" custom-icon="fa fa-plus" @click="create()" size="small">
+                  {{ $t('Front_Btn_New') }}
+                </Button>
                 <!--
                   @slot 筛选栏按钮
               -->
@@ -474,6 +476,14 @@
               custom-icon="fa fa-edit"
               @click="edit(rowData(row, index), index)"
             ></Button>
+            <Button
+              v-if="judge(tableView.showEnable, tableView.showEnableJson, rowData(row, index)) && showEnable"
+              size="small"
+              :title="$t('Front_Btn_Detail')"
+              type="info"
+              custom-icon="fa fa-file-alt"
+              @click="show(rowData(row, index), index)"
+            ></Button>
             <Button
               v-if="judge(tableView.removeEnable, tableView.removeEnableJson, rowData(row, index)) && removeEnable && !readonly"
               size="small"
@@ -826,6 +836,13 @@
         type: Boolean,
         default: true
       },
+      /**
+       * 允许查看
+       */
+      showEnable: {
+        type: Boolean,
+        default: true
+      },
       /**
        * 允许删除
        */
@@ -1332,6 +1349,20 @@
          */
         this.$emit('edit', { row, index });
       },
+      /**
+       * 查看项
+       *
+       * @param {object} row 行对象
+       * @param {int} index 行序号
+       * @public
+       */
+      show(row, index) {
+        /**
+         * 查看事件
+         * @property {object} args { row 行对象, index 行序号 }
+         */
+        this.$emit('show', { row, index });
+      },
       /**
        * 删除项
        *

package/src/pages/system/tableView.vue

@@ -113,6 +113,28 @@
             {{ $t('Front_Btn_Condition') }}
           </Button>
         </div>
+        <div v-if="code == 'showEnable'">
+          <Switch
+            :model-value="!!data.showEnable"
+            v-if="showCheck(data.showEnableJson)"
+            @update:model-value="
+              $event => {
+                data.showEnable = $event;
+                //$forceUpdate();
+              }
+            "
+            @on-change="checkChange('showEnableJson', 'showEnable')"
+          />
+          <Button
+            style="margin-left: 8px"
+            @click="$refs.conditionEdit.open(data, 'showEnableJson', 'showEnable', $refs.form.data.model)"
+            type="primary"
+            size="small"
+            icon="ios-settings"
+          >
+            {{ $t('Front_Btn_Condition') }}
+          </Button>
+        </div>
         <div v-if="code == 'removeEnable'">
           <Switch
             :model-value="!!data.removeEnable"

package/src/pages/template/viewPage.vue

@@ -11,6 +11,7 @@
         :removeEnable="allow('remove')"
         @create="$refs.form.open()"
         @edit="({ row, index }) => $refs.form.open(row)"
+        @show="({ row, index }) => $refs.showForm.open(row)"
       >
         <template #command="{ row }">
           <Button
@@ -26,6 +27,7 @@
       </view-table>
     </Card>
     <modal-form ref="form" :createEnable="allow('create')" :editEnable="allow('edit')" v-if="page" @on-after-save="$refs.table.loadData()" />
+    <modal-form ref="showForm" v-if="page" :readonly="page.showViewCode == null" :save-enable="false" />
     <template v-if="inited">
       <modal-table
         v-for="table in tables"
@@ -96,6 +98,12 @@
             this.$refs.form.init(this.page.formViewCode);
           }
 
+          if (!!(this.page.showViewCode || '').trim()) {
+            this.$refs.showForm.init(this.page.showViewCode);
+          } else if (!!(this.page.formViewCode || '').trim()) {
+            this.$refs.showForm.init(this.page.formViewCode);
+          }
+
           this.page.controls = res.customPageControls.filter(item => {
             return item.customPageComponentID == null;
           });