mooho-base-admin-plus 0.4.12 → 0.4.15

package/package.json

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

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

@@ -2,10 +2,10 @@
   <div>
     <modal-table ref="table" :static="true" :setting-enable="false" :footer-enable="true" :draggable="true" :sticky="true" @on-drag-drop="dragDrop" v-if="active">
       <template #command="{ row, index }">
-        <Button size="small" :title="$('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="edit(row, index)"></Button>
-        <Button size="small" :title="$('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="up(row, index)"></Button>
-        <Button size="small" :title="$('Front_Btn_Down')" type="primary" ghost custom-icon="fa fa-chevron-down" @click="down(row, index)"></Button>
-        <Button size="small" :title="$('Front_Btn_Remove')" type="primary" ghost custom-icon="fa fa-times" @click="remove(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="edit(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="up(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Down')" type="primary" ghost custom-icon="fa fa-chevron-down" @click="down(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Remove')" type="primary" ghost custom-icon="fa fa-times" @click="remove(row, index)"></Button>
       </template>
       <template #footer>
         <Button type="primary" ghost custom-icon="fa fa-eye" @click="layoutMode">{{ $t('Front_Btn_Preview_Mode') }}</Button>

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

@@ -46,6 +46,7 @@
         :on-search="onSearch"
         :summary-method="summaryMethod"
         :page-size-opts="pageSizeOpts"
+        :span-method="spanMethod"
         @create="create"
         @edit="edit"
         @on-ready="onReady"
@@ -305,6 +306,12 @@
        */
       beforeClose: {
         type: Function
+      },
+      /**
+       * 合并单元格的配置
+       */
+      spanMethod: {
+        type: Function
       }
     },
     computed: {

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

@@ -146,6 +146,19 @@
                 @on-blur="onBlur(rowData(row, index), column)"
               />
             </template>
+            <template v-else-if="column.controlType === 'TextArea'">
+              <Input
+                type="textarea"
+                size="small"
+                :model-value="parseData(rowData(row, index), column.code)"
+                @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
+                :readonly="isReadonly(rowData(row, index), column)"
+                :style="{ width: column.controlWidth == null ? null : column.controlWidth - 36 + 'px' }"
+                :rows="column.controlHeight / 20"
+                :maxlength="column.maxLength"
+                :placeholder="column.description"
+              />
+            </template>
             <template v-else-if="column.controlType === 'NumberInput'">
               <Input
                 type="number"
@@ -772,6 +785,12 @@
        */
       pageSizeOpts: {
         type: Array
+      },
+      /**
+       * 合并单元格的配置
+       */
+      spanMethod: {
+        type: Function
       }
     },
     computed: {
@@ -1095,6 +1114,11 @@
           // }
         }
 
+        // 设置数据的可见性和只读属性
+        this.data.forEach(item => {
+          this.setShowStatus(item);
+        });
+
         // 如果这行数据有子集，需要添加展开加载方法
         if (this.treeEnable) {
           this.data.forEach(item => {
@@ -1729,33 +1753,7 @@
       },
       // 数据变化事件
       onDataChange(data, sender, selected) {
-        for (let column of this.columns) {
-          // 判断是否需要显示
-          if (!!(column.showJson || '').trim()) {
-            if (data._isShow == null) {
-              data._isShow = {};
-            }
-
-            let setting = JSON.parse(column.showJson);
-
-            if (setting.type == 'Condition' || setting.type == 'Expression') {
-              data._isShow[column.code] = this.judgeCondition(setting, data);
-            }
-          }
-
-          // 判断是否只读
-          if (!!(column.readonlyJson || '').trim()) {
-            if (data._isReadonly == null) {
-              data._isReadonly = {};
-            }
-
-            let setting = JSON.parse(column.readonlyJson);
-
-            if (setting.type == 'Condition' || setting.type == 'Expression') {
-              data._isReadonly[column.code] = this.judgeCondition(setting, data);
-            }
-          }
-        }
+        this.setShowStatus(data);
 
         //this.$forceUpdate();
 
@@ -2195,7 +2193,11 @@
         this.preview = true;
       },
       // 合并单元格方法
-      handleSpan({ row, column, rowIndex }) {
+      handleSpan({ row, column, rowIndex, columnIndex }) {
+        if (this.spanMethod != null) {
+          return this.spanMethod(row, column, rowIndex, columnIndex);
+        }
+
         if (column.mergeSame) {
           if (rowIndex != 0 && this.parseData(row, column.code) == this.parseData(this.data[rowIndex - 1], column.code)) {
             return [0, 0];
@@ -2285,6 +2287,36 @@
 
         return result;
       },
+      // 设置可见性和只读
+      setShowStatus(data) {
+        for (let column of this.columns) {
+          // 判断是否需要显示
+          if (!!(column.showJson || '').trim()) {
+            if (data._isShow == null) {
+              data._isShow = {};
+            }
+
+            let setting = JSON.parse(column.showJson);
+
+            if (setting.type == 'Condition' || setting.type == 'Expression') {
+              data._isShow[column.code] = this.judgeCondition(setting, data);
+            }
+          }
+
+          // 判断是否只读
+          if (!!(column.readonlyJson || '').trim()) {
+            if (data._isReadonly == null) {
+              data._isReadonly = {};
+            }
+
+            let setting = JSON.parse(column.readonlyJson);
+
+            if (setting.type == 'Condition' || setting.type == 'Expression') {
+              data._isReadonly[column.code] = this.judgeCondition(setting, data);
+            }
+          }
+        }
+      },
       // 获取多语言名称
       getNameI18n(column) {
         if (column) {

package/src/index.js

@@ -56,6 +56,7 @@ import NoticeList from './components/home/notice-list.vue';
 
 // API
 import modelApi from './api/model';
+import customModelApi from './api/customModel';
 import dataSourceApi from './api/dataSource';
 import taskApi from './api/task';
 import applicationApi from './api/application';
@@ -199,4 +200,23 @@ const routeChanged = to => {
 
 export default API;
 
-export { pages, App, store, i18n, setting, basicLayout, lodop, request, mixinPage, modelApi, dataSourceApi, taskApi, applicationApi, util, createRouter, created, routeChanged };
+export {
+  pages,
+  App,
+  store,
+  i18n,
+  setting,
+  basicLayout,
+  lodop,
+  request,
+  mixinPage,
+  modelApi,
+  customModelApi,
+  dataSourceApi,
+  taskApi,
+  applicationApi,
+  util,
+  createRouter,
+  created,
+  routeChanged
+};

package/src/mixins/page.js

@@ -521,7 +521,9 @@ export default {
           } else if (operator == 'LessThanOrEqual') {
             result = data <= value;
           } else if (operator == 'NotEqual') {
-            result = String(data) != value;
+            result = value.split(',').every(item => {
+              return String(data) != item;
+            });
           }
 
           if (!result) {

package/src/pages/system/apiLog.vue

@@ -6,8 +6,8 @@
     <Card :bordered="false" dis-hover class="ivu-mt">
       <view-table ref="table" view-code="ApiLog">
         <template #command="{ row }">
-          <Button size="small" :title="$('Front_Btn_Request')" type="info" custom-icon="fa fa-cloud-upload-alt" @click="openRequest(row)"></Button>
-          <Button size="small" :title="$('Front_Btn_Response')" type="info" custom-icon="fa fa-cloud-download-alt" @click="openResponse(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Request')" type="info" custom-icon="fa fa-cloud-upload-alt" @click="openRequest(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Response')" type="info" custom-icon="fa fa-cloud-download-alt" @click="openResponse(row)"></Button>
         </template>
       </view-table>
     </Card>

package/src/pages/system/formView.vue

@@ -104,7 +104,7 @@
       copy() {
         this.confirmInput(
           'Front_Msg_Sure_To_Copy_Create_View',
-          'Front_Label_View_Code',
+          this.$t('Front_Label_View_Code'),
           async () => {
             let dataView = await dataViewApi.copy(this.$refs.form.data.id, this.newCode);
             this.$refs.form.open(dataView);