mooho-base-admin-plus 2.10.10 → 2.10.12

package/package.json

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

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

@@ -171,7 +171,7 @@
               </FormItem>
             </Col>
             <Col v-bind="grid8" v-if="data.controlType == 'DialogSelect' || data.controlType == 'MultiDialogSelect' || data.controlType == 'Table' || data.controlType == 'List'">
-              <FormItem label="视图" key="dataViewSource" prop="dataViewSource">
+              <FormItem label="表格视图" key="dataViewSource" prop="dataViewSource">
                 <dialog-select
                   ref="dataViewSource"
                   v-model="data.source"
@@ -227,8 +227,8 @@
                 />
               </FormItem>
             </Col>
-            <Col v-bind="grid8" v-if="data.controlType == 'Hyperlink'">
-              <FormItem label="链接地址" key="hyperlink" prop="hyperlink">
+            <Col v-bind="grid16" v-if="data.controlType == 'Hyperlink'">
+              <FormItem label="链接地址模板（可插入属性）" key="hyperlink" prop="hyperlink">
                 <Input type="text" v-model="data.hyperlink" maxlength="200" />
               </FormItem>
             </Col>
@@ -245,6 +245,23 @@
                 />
               </FormItem>
             </Col>
+            <Col v-bind="grid8" v-if="data.controlType == 'ModalForm'">
+              <FormItem label="表单视图" key="dataViewSource" prop="dataViewSource">
+                <dialog-select
+                  ref="dataViewSource"
+                  v-model="data.source"
+                  source="DataViewSelect"
+                  source-data-code="code"
+                  source-display-code="code"
+                  :param="{ viewType: 'FormView' }"
+                ></dialog-select>
+              </FormItem>
+            </Col>
+            <Col v-bind="grid8" v-if="data.controlType == 'ModalForm'">
+              <FormItem label="链接文字模板（可插入属性）" key="description" prop="description">
+                <Input type="text" v-model="data.description" maxlength="200" />
+              </FormItem>
+            </Col>
             <Col v-bind="grid8">
               <FormItem label="是否显示" key="isShow" prop="isShow">
                 <Switch
@@ -392,7 +409,7 @@
                 </Dropdown>
               </FormItem>
             </Col>
-            <Col v-bind="grid8" v-if="data.controlType != 'Description'">
+            <Col v-bind="grid8" v-if="data.controlType != 'Description' && data.controlType != 'ModalForm'">
               <FormItem label="描述" key="description" prop="description">
                 <Input type="text" v-model="data.description" maxlength="200" />
               </FormItem>

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

@@ -179,6 +179,7 @@
             item.id == 'MultiDialogSelect' ||
             item.id == 'TreeSelect' ||
             item.id == 'MultiTreeSelect' ||
+            item.id == 'ModalForm' ||
             item.id == 'Radio' ||
             item.id == 'CheckGroup'
           ) {

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

@@ -64,6 +64,11 @@
                   <span v-html="showData(data, column)"></span>
                 </a>
               </template>
+              <template v-if="column.controlType === 'ModalForm'">
+                <a href="#">
+                  <span v-html="getTemplateReplace(data, column.description)"></span>
+                </a>
+              </template>
               <template v-else-if="column.controlType === 'TextInput'">
                 <Input
                   type="text"

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

@@ -102,10 +102,16 @@
                 <div v-html="showMultiLine(column.description)"></div>
               </template>
               <template v-if="column.controlType === 'Hyperlink'">
-                <a :href="getHyperlink(data, column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
+                <a :href="getTemplateReplace(data, column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
                   <span v-html="showData(data, column)"></span>
                 </a>
               </template>
+              <template v-if="column.controlType === 'ModalForm'">
+                <a href="#" @click="openModalForm($refs['modalForm_' + column.code][0], parseData(data, column.code))">
+                  <span v-html="getTemplateReplace(data, column.description)"></span>
+                </a>
+                <modal-form :ref="'modalForm_' + column.code" :view-code="column.source" :readonly="true"></modal-form>
+              </template>
               <template v-else-if="column.controlType === 'TextInput'">
                 <Input
                   type="text"
@@ -1723,6 +1729,17 @@
             item.needClear = true;
           });
         }
+      },
+      // 打开弹出表单
+      async openModalForm(control, id) {
+        let data;
+        if (control.formView.isCustom) {
+          data = await customModelApi.get(control.formView.model, id);
+        } else {
+          data = await modelApi.get(control.formView.model, id);
+        }
+
+        control.open(data);
       }
       // // 打印
       // print() {

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

@@ -143,10 +143,15 @@
               </Tag>
             </template>
             <template v-else-if="column.controlType === 'Hyperlink'">
-              <a :href="getHyperlink(rowData(row, index), column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
+              <a :href="getTemplateReplace(rowData(row, index), column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
                 <span v-html="showData(rowData(row, index), column)"></span>
               </a>
             </template>
+            <template v-else-if="column.controlType === 'ModalForm'">
+              <a href="#" @click="openModalForm($refs['modalForm_' + column.code][0], parseData(rowData(row, index), column.code))">
+                <span v-html="getTemplateReplace(rowData(row, index), column.description)"></span>
+              </a>
+            </template>
             <template v-else-if="column.controlType === 'TextInput'">
               <Input
                 type="text"
@@ -610,6 +615,12 @@
           <Button type="default" custom-icon="fa fa-times" @click="$refs.batchEditTable.close()">{{ $t('Front_Btn_Close') }}</Button>
         </template>
       </modal-table>
+      <modal-form
+        v-for="column in columns.filter(item => item.controlType == 'ModalForm')"
+        :ref="'modalForm_' + column.code"
+        :view-code="column.source"
+        :readonly="true"
+      ></modal-form>
       <Modal
         :title="$t('Front_Label_Preview')"
         v-model="preview"
@@ -703,7 +714,7 @@
         width: widthSetting[item.code] ? widthSetting[item.code] : item.controlWidth,
         minWidth: 100,
         align: item.align ? item.align.toLowerCase() : 'center',
-        sortable: !view.dataView.sortDisable && !item.sortDisable && (!item.isVirtual || isStatic) ? 'custom' : false,
+        sortable: !view.dataView.sortDisable && !view.dataView.adjustEnable && !item.sortDisable && (!item.isVirtual || isStatic) ? 'custom' : false,
         resizable: true,
         slot: 'normal'
       };
@@ -1713,14 +1724,24 @@
         }
 
         data.forEach(item => {
-          delete item._checked;
-          delete item._dataSource;
-          delete item._needRefresh;
-          delete item._needClear;
-          delete item._rawData;
-          delete item._disabled;
+          for (let key in item) {
+            if (key.startsWith('_')) {
+              delete item[key];
+            }
+          }
         });
 
+        console.log('data', data);
+
+        // 调整顺序
+        if (this.tableView.adjustEnable) {
+          let i = 0;
+          for (let item of data) {
+            item.orderNo = i;
+            i += 10;
+          }
+        }
+
         return data;
       },
       /**
@@ -2787,9 +2808,9 @@
           data.splice(index, 1);
           data.splice(index - 1, 0, row);
 
-          for (let item of data) {
-            delete item.id;
-          }
+          // for (let item of data) {
+          //   delete item.id;
+          // }
 
           this.loadData(data);
         }
@@ -2801,9 +2822,9 @@
           data.splice(index, 1);
           data.splice(index + 1, 0, row);
 
-          for (let item of data) {
-            delete item.id;
-          }
+          // for (let item of data) {
+          //   delete item.id;
+          // }
 
           this.loadData(data);
         }
@@ -2916,6 +2937,19 @@
          * 点击单元格时触发
          */
         this.$emit('on-cell-click', row, column, data, event);
+      },
+      // 打开弹出表单
+      async openModalForm(control, id) {
+        console.log('control', control);
+
+        let data;
+        if (control.formView.isCustom) {
+          data = await customModelApi.get(control.formView.model, id);
+        } else {
+          data = await modelApi.get(control.formView.model, id);
+        }
+
+        control.open(data);
       }
     }
   };

package/src/i18n/locale/en-US.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};

package/src/i18n/locale/lang.js

@@ -1 +1 @@
-const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};
+const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};

package/src/i18n/locale/zh-CN.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};

package/src/mixins/page.js

@@ -771,17 +771,24 @@ export default {
         return swal;
       }
     },
-    // 获取超链接
-    getHyperlink(data, hyperlink) {
-      while (hyperlink.indexOf('{') >= 0) {
-        let start = hyperlink.indexOf('{');
-        let end = hyperlink.indexOf('}');
-        let expression = hyperlink.substring(start + 1, end);
+    // 文本模板替换
+    getTemplateReplace(data, template) {
+      let text = template;
+      while (text.indexOf('{') >= 0) {
+        let start = text.indexOf('{');
+        let end = text.indexOf('}');
+        let expression = text.substring(start + 1, end);
+
+        let value = this.parseData(data, expression);
+
+        if (value == null) {
+          value = '';
+        }
 
-        hyperlink = hyperlink.substring(0, start) + this.parseData(data, expression) + hyperlink.substring(end + 1);
+        text = text.substring(0, start) + value + text.substring(end + 1);
       }
 
-      return hyperlink;
+      return text;
     },
     // 保留小数
     keepDecimal(num, digit, fixedDigit) {