mooho-base-admin-plus 2.10.82 → 2.10.84

package/package.json

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

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

@@ -53,7 +53,7 @@
        * 字段代码
        */
       columnCode: {
-        type: Object
+        type: String
       },
       /**
        * 数据源
@@ -125,25 +125,33 @@
       ...mapActions('admin/dataView', { loadDataView: 'load' }),
       // 显示选择项
       showSelected() {
+        // 处理空值情况
         if (this.modelValue == null) {
           this.selected = null;
           this.selectedData = null;
           return;
-        } else if (this.multi) {
+        }
+
+        // 多选模式处理
+        if (this.multi) {
+          // 验证是否为有效JSON格式
           if (!this.isJSON(this.modelValue)) {
             this.selected = null;
             this.selectedData = null;
             return;
           }
 
+          // 构建查询过滤器
           let filter = {
             page: 1,
             per: 999
           };
           filter[this.sourceDataCode] = JSON.parse(this.modelValue).join(',');
 
+          // 加载数据视图并查询
           this.loadDataView(this.source).then(async view => {
             if (view.dataView.isCustom) {
+              // 自定义模型查询
               let res = await customModelApi.query(view.dataView.model, filter, [this.sourceDataCode, this.sourceDisplayCode]);
               if (res.data.length > 0) {
                 this.selected = res.data
@@ -153,10 +161,9 @@
                   .join(',');
 
                 this.selectedData = res.data;
-
-                //this.$forceUpdate();
               }
             } else if (view.dataView.isDataSource) {
+              // 数据源查询
               let res = await dataSourceApi.query(view.dataView.dataSource, filter);
               if (res.table.length > 0) {
                 this.selected = res.table
@@ -165,10 +172,9 @@
                   })
                   .join(',');
                 this.selectedData = res.table;
-
-                //this.$forceUpdate();
               }
             } else {
+              // 普通模型查询
               let res = await modelApi.query(view.dataView.model, filter, [this.sourceDataCode, this.sourceDisplayCode]);
               if (res.data.length > 0) {
                 this.selected = res.data
@@ -178,53 +184,68 @@
                   .join(',');
 
                 this.selectedData = res.data;
-
-                //this.$forceUpdate();
               }
             }
           });
         } else {
+          // 单选模式处理
           if (this.rawData && this.columnCode.endsWith('ID')) {
-            let selected = this.parseData(this.rawData, this.columnCode.substring(0, this.columnCode.length - 2));
+            // 从原始数据中获取模型信息
+            let model = this.parseData(this.rawData, this.columnCode.substring(0, this.columnCode.length - 2));
+
+            if (model != null) {
+              let code;
 
-            if (selected != null) {
-              this.selected = this.parseData(selected, this.sourceDisplayCode);
-              this.selectedData = selected;
+              if (this.sourceDataCode == 'id') {
+                code = this.sourceDisplayCode;
+              } else if (this.sourceDataCode.endsWith('ID')) {
+                let pre = this.sourceDataCode.substring(0, this.sourceDataCode.length - 2) + '.';
 
-              return;
+                if (this.sourceDisplayCode.startsWith(pre)) {
+                  code = this.sourceDisplayCode.substring(pre.length);
+                }
+              }
+
+              if (code) {
+                let selected = this.parseData(model, code);
+
+                if (selected) {
+                  this.selected = selected;
+                  return;
+                }
+              }
             }
           }
 
+          // 构建单选查询过滤器
           let filter = {
             page: 1,
             per: 1
           };
           filter[this.sourceDataCode] = this.modelValue;
 
+          // 加载数据视图并查询
           this.loadDataView(this.source).then(async view => {
             if (view.dataView.isCustom) {
+              // 自定义模型查询
               let res = await customModelApi.query(view.dataView.model, filter);
               if (res.data.length > 0) {
                 this.selected = this.parseData(res.data[0], this.sourceDisplayCode);
                 this.selectedData = res.data[0];
-
-                //this.$forceUpdate();
               }
             } else if (view.dataView.isDataSource) {
+              // 数据源查询
               let res = await dataSourceApi.query(view.dataView.dataSource, filter);
               if (res.table.length > 0) {
                 this.selected = this.parseData(res.table[0], this.sourceDisplayCode);
                 this.selectedData = res.table[0];
-
-                //this.$forceUpdate();
               }
             } else {
+              // 普通模型查询
               let res = await modelApi.query(view.dataView.model, filter);
               if (res.data.length > 0) {
                 this.selected = this.parseData(res.data[0], this.sourceDisplayCode);
                 this.selectedData = res.data[0];
-
-                //this.$forceUpdate();
               }
             }
           });

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

@@ -2142,7 +2142,12 @@
         }
 
         if (code) {
-          this.setData(data, code, model);
+          let objModel = model;
+          if (sender.sourceDataCode.endsWith('ID')) {
+            objModel = this.parseData(model, sender.sourceDataCode.substr(0, sender.sourceDataCode.length - 2));
+          }
+
+          this.setData(data, code, objModel);
         }
 
         this.onDataChange(data, sender, model);

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/token.txt

@@ -1,2 +1,2 @@
 echo "//registry.npmjs.org/:_authToken=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" >> .npmrc
-npm config set //registry.npmjs.org/:_authToken=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
+npm config set //registry.npmjs.org/:_authToken=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