three-trees-ui 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/OnlineForm/src/Form.vue

@@ -306,7 +306,10 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         text-align: left;
+        display: flex;
+        align-items: center;
         > span {
+          flex: 1;
           display: inline-block;
           max-width: 100%;
           font-size: 14px;

package/src/directive/formulas.js

@@ -233,7 +233,7 @@ const Formulas = {
   },
   LARGE: (array, index) => {
     index = Formulas.parseNumber(index)
-    return array.sort(function(a, b) {
+    return array.sort(function (a, b) {
       return b - a
     })[index - 1]
   },
@@ -300,7 +300,7 @@ const Formulas = {
   },
   SMALL: (array, index) => {
     array = Formulas.parseNumberArray(array)
-    return array.sort(function(a, b) {
+    return array.sort(function (a, b) {
       return a - b
     })[index - 1]
   },
@@ -479,7 +479,17 @@ const Formulas = {
   DATEDELTA: (string, days) => {
     let timestamp = new Date(string).getTime()
     timestamp += days * 86400000
-    return Formulas.DATE(timestamp)
+    let date = Formulas.parseDate(timestamp)
+    if (date == 'Invalid Date') {
+      Notification.error({
+        title: '错误',
+        message: '无效日期',
+      })
+      return
+    }
+    return date.format(
+      utils.isMobile() ? 'yyyy/MM/dd HH:mm:ss' : 'yyyy-MM-dd HH:mm:ss'
+    )
   },
   HALFDAY: (startDate, endDate) => {
     let half = 0.5

package/src/mixins/templatePreview.js

@@ -2390,7 +2390,11 @@ export default {
         .then(() => {
           let s = []
           for (let i = 0; i < this.tableData.selectRows.length; i++) {
-            s.push(this.tableData.selectRows[i][this.templateInfo.pkField])
+            s.push(
+              this.tableData.selectRows[i][
+                this.templateInfo.pkField ? this.templateInfo.pkField : 'id_'
+              ]
+            )
           }
           let data = {
             ids: s.join(','),
@@ -2566,16 +2570,26 @@ export default {
       }
       //TODO 如果是模块开发 全部已新窗口打开
       if (openType == 'new' || this.isJoinFlow) {
-        window.open(
-          this.$router.resolve({
+        if (this.$tabs) {
+          this.$router.push({
             path: path + '&isNewPage=true',
             query: {
               quitAfterSaving,
               customTitleName,
             },
-          }).href,
-          '_blank'
-        )
+          })
+        } else {
+          window.open(
+            this.$router.resolve({
+              path: path + '&isNewPage=true',
+              query: {
+                quitAfterSaving,
+                customTitleName,
+              },
+            }).href,
+            '_blank'
+          )
+        }
       } else if (openType === 'dialog' || isDataView) {
         this.$refs.templateFormDialog.showDialog({
           templateKey: this.templateInfo.alias,