vue2-client 1.8.263 → 1.8.265

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.263",
+  "version": "1.8.265",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/LowCodeComponent/LowCodePageOrganization.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <p v-if="config.page.length === 0"> 未选中任何工作空间 </p>
     <a-tree
       v-if="showTree"
       defaultExpandAll
@@ -16,11 +17,14 @@
           <span>{{ title }}</span>
           <template #overlay>
             <a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey)">
-              <a-menu-item key="copy">复制</a-menu-item>
-              <a-menu-item key="paste" :disabled="copyCache === undefined">粘贴</a-menu-item>
-              <a-menu-item key="split" :disabled="determineLevel(treeKey) !== 'item'">拆分</a-menu-item>
-              <a-menu-item key="rename" :disabled="treeKey.length > 2 && treeKey.length <= 5">重命名</a-menu-item>
-              <a-menu-item key="delete">删除</a-menu-item>
+              <a-menu-item key="copy"><a-icon type="copy" />&nbsp;&nbsp;复制</a-menu-item>
+              <a-menu-item key="paste" :disabled="copyCache === undefined"><a-icon type="snippets" />&nbsp;&nbsp;粘贴</a-menu-item>
+              <a-menu-divider />
+              <a-menu-item key="split" :disabled="determineLevel(treeKey) !== 'item'"><a-icon type="fullscreen" />&nbsp;&nbsp;拆分</a-menu-item>
+              <a-menu-item key="add" :disabled="determineLevel(treeKey) === 'item'"><a-icon type="plus-square" />&nbsp;&nbsp;添加</a-menu-item>
+              <a-menu-item key="rename" :disabled="treeKey.length > 2 && treeKey.length <= 5"><a-icon type="italic" />&nbsp;&nbsp;重命名</a-menu-item>
+              <a-menu-divider />
+              <a-menu-item key="delete"><a-icon type="delete" />&nbsp;&nbsp;删除</a-menu-item>
             </a-menu>
           </template>
         </a-dropdown>
@@ -28,7 +32,7 @@
       <!--   树中的图标   -->
       <a-icon slot="file" type="file" />
       <a-icon slot="appstore" type="appstore" />
-      <a-icon slot="layout" type="layout" />
+      <a-icon slot="pause" type="pause" />
       <a-icon slot="ordered-list" type="ordered-list" />
     </a-tree>
     <!--  页面容器重命名弹框  -->
@@ -93,6 +97,29 @@ export default {
         return treeKey
       }
     },
+    determineDragLevel (id) {
+      if (id.startsWith('page')) {
+        return {
+          type: 'page',
+          level: 0
+        }
+      } else if (id.startsWith('container_page_')) {
+        return {
+          type: 'container_page',
+          level: 2
+        }
+      } else if (id.startsWith('row')) {
+        return {
+          type: 'row',
+          level: 1
+        }
+      } else {
+        return {
+          type: 'item',
+          level: 2
+        }
+      }
+    },
     // 树拖拽事件
     treeDrop (info) {
       // 拖拽结束目标的id
@@ -103,15 +130,9 @@ export default {
       const dropPos = info.node.pos.split('-')
 
       // 拖拽结束目标的类型
-      const dropLevel = this.determineLevel(dropKey)
+      const dropLevel = this.determineDragLevel(dropKey)
       // 被拖拽的类型
-      const dragLevel = this.determineLevel(dragKey)
-
-      // 移动页面容器没有意义
-      if (dragLevel === 'page') {
-        this.$message.error('该移动不合法！')
-        return
-      }
+      const dragLevel = this.determineDragLevel(dragKey)
 
       // 拖拽对于目标的定位，-1表示之前，0表示插入，1表示之后
       const dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1])
@@ -122,34 +143,34 @@ export default {
       // 3. 高级组件移动到低级
       // 4. 相差2级移动
       // 唯一特例，行可以插入容器页面，容器页面等于模块级别，但可以被行插入
-      if (dragLevel === 'row') {
-        if (dropLevel === 'page' && dropPosition !== 0) {
-          this.$message.error('该移动不合法！')
-          return
-        }
-        if (dropLevel === 'row' && dropPosition === 0) {
-          this.$message.error('该移动不合法！')
-          return
-        }
-        if (dropLevel === 'item') {
-          this.$message.error('该移动不合法！')
-          return
-        }
-      } else if (dragLevel === 'item') {
-        if (dropLevel === 'page') {
-          this.$message.error('该移动不合法！')
-          return
-        }
-        if (dropLevel === 'row' && dropPosition !== 0) {
-          this.$message.error('该移动不合法！')
-          return
-        }
-        if (dropLevel === 'item' && dropPosition === 0) {
-          this.$message.error('该移动不合法！')
-          return
-        }
+
+      // 只有三种情况可以拖拽
+      // 1.平级挪
+      // 2.高一级插
+      // 3.行插子页面
+
+      // 1. 平级挪
+      if (dropLevel.level === dragLevel.level && dropPosition !== 0) {
+        const dragType = 'move'
+        this.$emit('componentMove', this.getOriginalKey(dragKey), this.getOriginalKey(dropKey), dragLevel, dropLevel, dropPosition, dragType)
+        return
       }
-      this.$emit('componentMove', dragKey, dropKey, dropLevel, dropPosition)
+
+      // 2.高一级插
+      if (dropLevel.level === (dragLevel.level - 1) && dropPosition === 0) {
+        const dragType = 'higher'
+        this.$emit('componentMove', this.getOriginalKey(dragKey), this.getOriginalKey(dropKey), dragLevel, dropLevel, dropPosition, dragType)
+        return
+      }
+
+      // 3.行插子页面
+      if (dragLevel.type === 'row' && dropLevel.type === 'container_page' && dropPosition === 0) {
+        const dragType = 'rowToContainer'
+        this.$emit('componentMove', this.getOriginalKey(dragKey), this.getOriginalKey(dropKey), dragLevel, dropLevel, dropPosition, dragType)
+        return
+      }
+      // 能到这不return的证明都是非法移动
+      this.$message.error('不合法的拖拽！')
     },
     handleDelete (targetType, originalKey) {
       const _this = this
@@ -283,6 +304,13 @@ export default {
         },
       })
     },
+    handleAdd (targetType, originalKey) {
+      if (targetType === 'page' || targetType === 'container_page') {
+        this.$emit('add', originalKey, 'row')
+      } else if (targetType === 'row') {
+        this.$emit('add', originalKey, 'container')
+      }
+    },
     // 树右键事件
     onContextMenuClick (treeKey, menuKey) {
       // 判断目标类型
@@ -304,12 +332,15 @@ export default {
           return
         case 'split':
           this.handleSplit(originalKey)
+          return
+        case 'add':
+          this.handleAdd(targetType, originalKey)
       }
     },
     // 处理架构树点击事件
     handleTreeSelect (value) {
       this.selectedKeys = value
-      this.$emit('treeOrganizationClick', value[0])
+      this.$emit('treeOrganizationClick', this.getOriginalKey(value[0]))
       // 如果选中的id只有两位证明是页面容器
       // let isPage = false
       // if (value[0].length === 2) {
@@ -354,8 +385,8 @@ export default {
           icon = 'file'
           key = 'page_' + page.id
         } else {
-          title = '容器页面_' + page.id.split('_')[2]
-          icon = 'layout'
+          title = '列容器'
+          icon = 'pause'
           key = 'container_page_' + page.id
         }
         result.push({
@@ -370,7 +401,7 @@ export default {
         for (let j = 0; j < page.body.length; j++) {
           const row = page.body[j]
           result[i].children.push({
-            title: j + 1 + '行',
+            title: '行容器' + (j + 1),
             key: 'row_' + page.id + '_' + (j + 1),
             children: [],
             slots: {

package/src/base-client/components/common/LowCodePageRender/editorPageRender.vue

@@ -482,7 +482,23 @@ export default {
       })
     },
     twink (id) {
-
+      const frame = 400
+      this.$refs[id][0].className = 'colWithBorder'
+      setTimeout(() => {
+        this.$refs[id][0].className = ''
+      }, frame)
+      setTimeout(() => {
+        this.$refs[id][0].className = 'colWithBorder'
+      }, frame * 2)
+      setTimeout(() => {
+        this.$refs[id][0].className = ''
+      }, frame * 3)
+      setTimeout(() => {
+        this.$refs[id][0].className = 'colWithBorder'
+      }, frame * 4)
+      setTimeout(() => {
+        this.$refs[id][0].className = ''
+      }, frame * 5)
     }
   },
   watch: {
@@ -502,9 +518,11 @@ export default {
 }
 .componentInEditor:hover{
   border: 2px rgb( 24,144,255) solid;
+  box-shadow: 3px 3px 5px 1px rgba(0,0,0,0.2);
 }
 .colWithBorder{
   border: 2px rgb( 24,144,255) solid;
+  box-shadow: 3px 3px 5px 1px rgba(0,0,0,0.2);
 }
 .container{
   display: flex;

package/src/base-client/components/common/Upload/Upload.vue

@@ -44,7 +44,7 @@
 <script>
 
 import { mapState } from 'vuex'
-import { fileDelete, upload } from '@vue2-client/services/api/common'
+import { fileDelete, fileDeleteV4, upload } from '@vue2-client/services/api/common'
 
 export default {
   name: 'Uploads',
@@ -93,7 +93,8 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' })
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['compatible'])
   },
   created () {
     const list = this.model.type === 'file' ? [...this.files] : [...this.images]
@@ -184,19 +185,41 @@ export default {
     },
     // 删除文件
     deleteFileItem (file) {
-      if (file.id) {
-        fileDelete({ id: file.id, f_state: '删除' })
-          .then(res => {}).catch(e => { })
-      }
-      // 找到当前文件所在列表的索引
-      const index = this.uploadedFileList.indexOf(file)
-      // 从列表中移除该文件
-      this.uploadedFileList.splice(index, 1)
-      if (this.outerContainerIndex !== undefined) {
-        this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
-      } else {
-        this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-      }
+      const that = this
+      this.$confirm({
+        title: '提醒',
+        content: '确定删除该文件吗?',
+        okText: '删除',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk () {
+          //  阳春博能工单信息V4页面有时会删除V3照片, V3照片不能通过这个请求删除, 已经在外层进行删除处理
+          if (file.id && !file.version) {
+            switch (that.compatible) {
+              case 'V3':
+                fileDelete({ id: file.id, f_state: '删除' })
+                  .then(res => {}).catch(e => { })
+                break
+              case 'V4':
+                fileDeleteV4({ id: file.id, resDeleteMode: 'server' })
+                  .then(res => {}).catch(e => { })
+                break
+            }
+          }
+          // 找到当前文件所在列表的索引
+          const index = that.uploadedFileList.indexOf(file)
+          // 从列表中移除该文件
+          that.uploadedFileList.splice(index, 1)
+          if (that.outerContainerIndex !== undefined) {
+            that.$emit('setFiles', that.uploadedFileList.filter(item => item.status === 'done'), that.outerContainerIndex)
+          } else {
+            that.$emit('setFiles', that.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+          }
+        },
+        onCancel () {
+          console.log('取消删除')
+        },
+      })
       return true
     }
   }

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -88,6 +88,7 @@ import { addOrModify, getConfigByName, runLogic } from '@vue2-client/services/ap
 import lowcodeComponentMixin from '@vue2-client/utils/lowcode/lowcodeComponentMixin'
 import { _IDre15, _IDRe18, REG_EMAIL, REG_LANDLINE, REG_PHONE } from '@vue2-client/utils/reg'
 import moment from 'moment/moment'
+import executeStrFunction from '@vue2-client/utils/runEvalFunction'
 
 export default {
   name: 'XAddNativeForm',
@@ -306,7 +307,7 @@ export default {
       if (!formData[item.model]) {
         formData[item.model] = undefined
       }
-      if (!formData[item.model] && !item.formDefault) {
+      if (!formData[item.model] && item.formDefault) {
         if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker'].includes(item.type)) {
           formData[item.model] = this.getDateRange(item.type, item.formDefault)
         } else {
@@ -467,9 +468,68 @@ export default {
             })
             break
           }
+          // 大于0
+          case 'greaterThanZero': {
+            this.rules[item.model].push({
+              validator: (rule, value, callback) => {
+                if (isNaN(value) || value <= 0) {
+                  callback(new Error('请输入一个大于0的数字'))
+                } else {
+                  callback()
+                }
+              },
+              trigger: 'blur'
+            })
+            break
+          }
+            // 大于等于0
+          case 'greaterThanOrEqualZero': {
+            this.rules[item.model].push({
+              validator: (rule, value, callback) => {
+                if (isNaN(value) || value < 0) {
+                  callback(new Error('请输入一个大于等于0的数字'))
+                } else {
+                  callback()
+                }
+              },
+              trigger: 'blur'
+            })
+            break
+          }
+          case 'stringLength': {
+            this.rules[item.model].push({
+              validator: (rule, value, callback) => {
+                if (value && value.length < item.rule.minLen) {
+                  callback(new Error('长度不能少于' + item.rule.minLen + '个字符'))
+                } else if (value && value.length > item.rule.maxLen) {
+                  callback(new Error('长度不能超过' + item.rule.maxLen + '个字符'))
+                } else {
+                  callback()
+                }
+              },
+              trigger: 'blur'
+            })
+            break
+          }
+          case 'customJs': {
+            this.rules[item.model].push({
+              validator: (rule, value, callback) => {
+                this.customJsValidate(rule, value, callback, item)
+              },
+              trigger: 'blur'
+            })
+            break
+          }
         }
       }
     },
+    customJsValidate (rule, value, callback, item) {
+      if (item.rule.customValidatorFunc) {
+        executeStrFunction(item.rule.customValidatorFunc, [rule, value, callback, this.form, item, this.util])
+      } else {
+        callback()
+      }
+    },
     itemDisabled (value) {
       return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
         (this.businessType === '修改' && value.addOrEdit === 'add')

package/src/base-client/components/common/XDescriptions/lowcodeEditorRegister.js

@@ -1,31 +1,31 @@
-export const XDescriptionsConfig = {
-  type: 'XDescriptions',
-  properties: {
-    title: {
-      type: 'string',
-      label: '标题',
-      desc: '用于组件中标题位置显示内容'
-    },
-    content: {
-      type: 'object',
-      label: '数据',
-      desc: '该组件展示的数据'
-    },
-    configName: {
-      type: 'string',
-      label: '配置名',
-      desc: '该组件对应琉璃中的配置'
-    },
-    serviceName: {
-      type: 'string',
-      label: '命名空间',
-      desc: '该组件对应琉璃中配置的命名空间'
-    },
-    getRealData: {
-      type: 'boolean',
-      label: '格式化数据key',
-      desc: '该组件是否调用格式化数据的key，以获取真实的数据'
-    }
-  },
-  selfEvent: []
-}
+export const XDescriptionsConfig = {
+  type: 'XDescriptions',
+  properties: {
+    title: {
+      type: 'string',
+      label: '标题',
+      desc: '用于组件中标题位置显示内容'
+    },
+    content: {
+      type: 'object',
+      label: '数据',
+      desc: '该组件展示的数据'
+    },
+    configName: {
+      type: 'string',
+      label: '配置名',
+      desc: '该组件对应琉璃中的配置'
+    },
+    serviceName: {
+      type: 'string',
+      label: '命名空间',
+      desc: '该组件对应琉璃中配置的命名空间'
+    },
+    getRealData: {
+      type: 'boolean',
+      label: '格式化数据key',
+      desc: '该组件是否调用格式化数据的key，以获取真实的数据'
+    }
+  },
+  selfEvent: []
+}

package/src/base-client/components/common/XReportSlot/index.md

@@ -1,48 +1,48 @@
-# XReportSlot 暂时废弃
-
-
-动态报表的插槽组件，可以递归使用
-
-
-## 何时使用
-
-> 当需要一个动态生成的报表时
-
-> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
-> 则递归此组件
-
-引用方式：
-
-```javascript
-import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
-
-export default {
-    components: {
-      XReportSlot
-    }
-}
-```
-
-
-## API
-
-| 参数              | 说明                       | 类型     | 默认值  |
-|-----------------|--------------------------|--------|------|
-| config | 表格完整配置 | Object | 无（必填） |
-| forDisplay | 是否为展示页 | Boolean | false |
-| slotConfigName | 插槽名 | String | undefined |
-
-## 例子1
-----
-```vue
-<XReportSlot
-  :config="activatedConfig"
-  :slot-config-name="slotConfig"
-  :for-display="forDisplay">
-</XReportSlot>
-```
-## 注意事项
-> slotConfigName如果不填，则展示整个表格。
-> 如果填写，则仅展示插槽中的内容
-
-> 该组件可以递归调用
+# XReportSlot 暂时废弃
+
+
+动态报表的插槽组件，可以递归使用
+
+
+## 何时使用
+
+> 当需要一个动态生成的报表时
+
+> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
+> 则递归此组件
+
+引用方式：
+
+```javascript
+import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
+
+export default {
+    components: {
+      XReportSlot
+    }
+}
+```
+
+
+## API
+
+| 参数              | 说明                       | 类型     | 默认值  |
+|-----------------|--------------------------|--------|------|
+| config | 表格完整配置 | Object | 无（必填） |
+| forDisplay | 是否为展示页 | Boolean | false |
+| slotConfigName | 插槽名 | String | undefined |
+
+## 例子1
+----
+```vue
+<XReportSlot
+  :config="activatedConfig"
+  :slot-config-name="slotConfig"
+  :for-display="forDisplay">
+</XReportSlot>
+```
+## 注意事项
+> slotConfigName如果不填，则展示整个表格。
+> 如果填写，则仅展示插槽中的内容
+
+> 该组件可以递归调用