mooho-base-admin-plus 0.4.39 → 0.4.41

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.39",
+  "version": "0.4.41",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/components/input/item-select.vue

@@ -64,6 +64,7 @@
     mixins: [mixinPage],
     data() {
       return {
+        inited: false,
         opened: false, // 是否打开
         sourceFilter: {} // 来源筛选
       };
@@ -114,6 +115,8 @@
           this.$refs.selectTargetTable.init(targetViewCode, () => {
             this.setSelected([]);
 
+            this.inited = true;
+
             if (typeof callback === 'function') {
               callback();
             }
@@ -151,8 +154,10 @@
        * @public
        */
       setSelected(data) {
-        this.$refs.selectTargetTable.loadData(data);
-        this.$refs.selectSourceTable.setSelected(data);
+        if (this.inited) {
+          this.$refs.selectTargetTable.loadData(data);
+          this.$refs.selectSourceTable.setSelected(data);
+        }
       },
       /**
        * 刷新来源数据

package/src/components/upload/file-upload.vue

@@ -7,7 +7,7 @@
     :on-success="importFileSuccess"
     :on-error="importFileError"
     :before-upload="beforeUpload"
-    style="display: inline-block; margin-left: 8px; margin-right: 8px"
+    style="display: inline-block"
   >
     <slot></slot>
   </Upload>

package/src/components/view/column-edit.vue

@@ -278,6 +278,19 @@
                 </Button>
               </FormItem>
             </Col>
+            <Col v-bind="grid8">
+              <FormItem label="禁用排序" key="sortDisable" prop="sortDisable">
+                <Switch
+                  :model-value="!!data.sortDisable"
+                  @update:model-value="
+                    $event => {
+                      data.sortDisable = $event;
+                      //$forceUpdate();
+                    }
+                  "
+                />
+              </FormItem>
+            </Col>
             <Col v-bind="grid8">
               <FormItem label="默认值" key="defaultValue" prop="defaultValue">
                 <Input type="text" v-model="data.defaultValue" maxlength="200" />

package/src/components/view/column-select.vue

@@ -53,7 +53,7 @@
         column: {
           code: groupColumn.property,
           name: groupColumn.property,
-          dataType: groupColumn.dataType == 'DateTime' && groupColumn.dateTimeGroupType != 'Day' ? 'Integer' : groupColumn.dataType,
+          dataType: groupColumn.dataType == 'DateTime' && groupColumn.dateTimeGroupType != 'Date' ? 'Integer' : groupColumn.dataType,
           columns: []
         },
         title: groupColumn.property + ' (' + groupColumn.property + ')',

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

@@ -545,7 +545,7 @@
         width: item.controlWidth,
         minWidth: 100,
         align: item.align ? item.align.toLowerCase() : 'center',
-        sortable: 'custom',
+        sortable: !view.dataView.sortDisable && !item.sortDisable ? 'custom' : false,
         resizable: true,
         slot: 'normal'
       };

package/src/layouts/basic-layout/menu-side/menu-title.vue

@@ -10,14 +10,14 @@
       :class="{
         'i-layout-menu-side-title-text-selected': selected,
         'i-layout-menu-side-title-text-with-subtitle':
-          (this.layout.showI18n && !!(this.$t('Permission_' + menu.code + '_SubName') || '').trim()) || (!this.layout.showI18n && !!(menu.subtitle || '').trim()),
+          (layout.showI18n && !!($t('Permission_' + menu.code + '_SubName') || '').trim()) || (!layout.showI18n && !!(menu.subtitle || '').trim()),
         'i-layout-menu-side-title-text-with-icon': withIcon
       }"
       v-if="!hideTitle"
     >
-      {{ this.layout.showI18n ? this.$t('Permission_' + menu.code) : menu.title }}
-      <em v-if="this.layout.showI18n && !!(this.$t('Permission_' + menu.code + '_SubName') || '').trim()">{{ this.$t('Permission_' + menu.code + '_SubName') }}</em>
-      <em v-if="!this.layout.showI18n && !!(menu.subtitle || '').trim()">{{ menu.subTitle }}</em>
+      {{ layout.showI18n ? $t('Permission_' + menu.code) : menu.title }}
+      <em v-if="layout.showI18n && !!($t('Permission_' + menu.code + '_SubName') || '').trim()">{{ $t('Permission_' + menu.code + '_SubName') }}</em>
+      <em v-if="!layout.showI18n && !!(menu.subTitle || '').trim()">{{ menu.subTitle }}</em>
     </span>
   </span>
 </template>

package/src/pages/system/formView.vue

@@ -7,7 +7,7 @@
       <view-table ref="table" view-code="FormView" :filter="filter" :selectEnable="true" @create="create" @edit="edit">
         <template #filterCommand>
           <Button size="small" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
-          <file-upload url="api/DataView/importFile" accept=".view" @on-success="importFileSuccess" style="display: inline-block; margin-left: 4px; margin-right: 4px">
+          <file-upload url="api/DataView/importFile" accept=".view" @on-success="importFileSuccess">
             <template #>
               <Button type="primary" custom-icon="fa fa-cloud-upload-alt" size="small">{{ $t('Front_Btn_Import') }}</Button>
             </template>

package/src/setting.js

@@ -161,7 +161,7 @@ const Setting = {
    * */
   waterMark: {
     // 是否显示
-    show: true,
+    show: false,
     // 初始显示文案，可以通过 vuex 随时更新
     text: 'MOOHO',
     // 水印配置

package/src/styles/css/default.css

@@ -247,15 +247,15 @@
   margin-bottom: 0;
 }
 
-.ivu-dropdown {
-  margin-right: 4px;
-}
-
 .filter .ivu-upload {
   margin-left: 2px !important;
   margin-right: 2px !important;
 }
 
+.ivu-dropdown {
+  margin-right: 4px;
+}
+
 /* 表格内部按钮 */
 .ivu-table-cell button + button {
   margin-left: 4px;