新增和修改安居接口以及优化流程接口

ruoyi-file/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.6.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-file</artifactId>
+
+    <description>
+        文件存放模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <!-- Minio -->
+       <!-- <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.5.2</version>
+        </dependency>-->
+
+    </dependencies>
+
+</project>

ruoyi-ui/src/utils/loadBeautifier.js

@@ -0,0 +1,28 @@
+import loadScript from './loadScript'
+import ELEMENT from 'element-ui'
+import pluginsConfig from './pluginsConfig'
+
+let beautifierObj
+
+export default function loadBeautifier(cb) {
+  const { beautifierUrl } = pluginsConfig
+  if (beautifierObj) {
+    cb(beautifierObj)
+    return
+  }
+
+  const loading = ELEMENT.Loading.service({
+    fullscreen: true,
+    lock: true,
+    text: '格式化资源加载中...',
+    spinner: 'el-icon-loading',
+    background: 'rgba(255, 255, 255, 0.5)'
+  })
+
+  loadScript(beautifierUrl, () => {
+    loading.close()
+    // eslint-disable-next-line no-undef
+    beautifierObj = beautifier
+    cb(beautifierObj)
+  })
+}

ruoyi-ui/src/utils/loadMonaco.js

@@ -0,0 +1,40 @@
+import loadScript from './loadScript'
+import ELEMENT from 'element-ui'
+import pluginsConfig from './pluginsConfig'
+
+// monaco-editor单例
+let monacoEidtor
+
+/**
+ * 动态加载monaco-editor cdn资源
+ * @param {Function} cb 回调，必填
+ */
+export default function loadMonaco(cb) {
+  if (monacoEidtor) {
+    cb(monacoEidtor)
+    return
+  }
+
+  const { monacoEditorUrl: vs } = pluginsConfig
+
+  // 使用element ui实现加载提示
+  const loading = ELEMENT.Loading.service({
+    fullscreen: true,
+    lock: true,
+    text: '编辑器资源初始化中...',
+    spinner: 'el-icon-loading',
+    background: 'rgba(255, 255, 255, 0.5)'
+  })
+
+  !window.require && (window.require = {})
+  !window.require.paths && (window.require.paths = {})
+  window.require.paths.vs = vs
+
+  loadScript(`${vs}/loader.js`, () => {
+    window.require(['vs/editor/editor.main'], () => {
+      loading.close()
+      monacoEidtor = window.monaco
+      cb(monacoEidtor)
+    })
+  })
+}

ruoyi-ui/src/views/tool/build/FormDrawer.vue

@@ -0,0 +1,333 @@
+<template>
+    <div>
+      <el-drawer v-bind="$attrs" v-on="$listeners" @opened="onOpen" @close="onClose">
+        <div style="height:100%">
+          <el-row style="height:100%;overflow:auto">
+            <el-col :md="24" :lg="12" class="left-editor">
+              <div class="setting" title="资源引用" @click="showResource">
+                <el-badge :is-dot="!!resources.length" class="item">
+                  <i class="el-icon-setting" />
+                </el-badge>
+              </div>
+              <el-tabs v-model="activeTab" type="card" class="editor-tabs">
+                <el-tab-pane name="html">
+                  <span slot="label">
+                    <i v-if="activeTab==='html'" class="el-icon-edit" />
+                    <i v-else class="el-icon-document" />
+                    template
+                  </span>
+                </el-tab-pane>
+                <el-tab-pane name="js">
+                  <span slot="label">
+                    <i v-if="activeTab==='js'" class="el-icon-edit" />
+                    <i v-else class="el-icon-document" />
+                    script
+                  </span>
+                </el-tab-pane>
+                <el-tab-pane name="css">
+                  <span slot="label">
+                    <i v-if="activeTab==='css'" class="el-icon-edit" />
+                    <i v-else class="el-icon-document" />
+                    css
+                  </span>
+                </el-tab-pane>
+              </el-tabs>
+              <div v-show="activeTab==='html'" id="editorHtml" class="tab-editor" />
+              <div v-show="activeTab==='js'" id="editorJs" class="tab-editor" />
+              <div v-show="activeTab==='css'" id="editorCss" class="tab-editor" />
+            </el-col>
+            <el-col :md="24" :lg="12" class="right-preview">
+              <div class="action-bar" :style="{'text-align': 'left'}">
+                <span class="bar-btn" @click="runCode">
+                  <i class="el-icon-refresh" />
+                  刷新
+                </span>
+                <span class="bar-btn" @click="exportFile">
+                  <i class="el-icon-download" />
+                  导出vue文件
+                </span>
+                <span ref="copyBtn" class="bar-btn copy-btn">
+                  <i class="el-icon-document-copy" />
+                  复制代码
+                </span>
+                <span class="bar-btn delete-btn" @click="$emit('update:visible', false)">
+                  <i class="el-icon-circle-close" />
+                  关闭
+                </span>
+              </div>
+              <iframe
+                v-show="isIframeLoaded"
+                ref="previewPage"
+                class="result-wrapper"
+                frameborder="0"
+                src="/preview.html"
+                @load="iframeLoad"
+              />
+              <div v-show="!isIframeLoaded" v-loading="true" class="result-wrapper" />
+            </el-col>
+          </el-row>
+        </div>
+      </el-drawer>
+      <resource-dialog
+        :visible.sync="resourceVisible"
+        :origin-resource="resources"
+        @save="setResource"
+      />
+    </div>
+  </template>
+  <script>
+  import { parse } from '@babel/parser'
+  import ClipboardJS from 'clipboard'
+  import { saveAs } from 'file-saver'
+  import {
+    makeUpHtml, vueTemplate, vueScript, cssStyle
+  } from '@/utils/generator/html'
+  import { makeUpJs } from '@/utils/generator/js'
+  import { makeUpCss } from '@/utils/generator/css'
+  import { exportDefault, beautifierConf, titleCase } from '@/utils/index'
+  import ResourceDialog from './ResourceDialog'
+  import loadMonaco from '@/utils/loadMonaco'
+  import loadBeautifier from '@/utils/loadBeautifier'
+  
+  const editorObj = {
+    html: null,
+    js: null,
+    css: null
+  }
+  const mode = {
+    html: 'html',
+    js: 'javascript',
+    css: 'css'
+  }
+  let beautifier
+  let monaco
+  
+  export default {
+    components: { ResourceDialog },
+    props: ['formData', 'generateConf'],
+    data() {
+      return {
+        activeTab: 'html',
+        htmlCode: '',
+        jsCode: '',
+        cssCode: '',
+        codeFrame: '',
+        isIframeLoaded: false,
+        isInitcode: false, // 保证open后两个异步只执行一次runcode
+        isRefreshCode: false, // 每次打开都需要重新刷新代码
+        resourceVisible: false,
+        scripts: [],
+        links: [],
+        monaco: null
+      }
+    },
+    computed: {
+      resources() {
+        return this.scripts.concat(this.links)
+      }
+    },
+    watch: {},
+    created() {
+    },
+    mounted() {
+      window.addEventListener('keydown', this.preventDefaultSave)
+      const clipboard = new ClipboardJS('.copy-btn', {
+        text: trigger => {
+          const codeStr = this.generateCode()
+          this.$notify({
+            title: '成功',
+            message: '代码已复制到剪切板，可粘贴。',
+            type: 'success'
+          })
+          return codeStr
+        }
+      })
+      clipboard.on('error', e => {
+        this.$message.error('代码复制失败')
+      })
+    },
+    beforeDestroy() {
+      window.removeEventListener('keydown', this.preventDefaultSave)
+    },
+    methods: {
+      preventDefaultSave(e) {
+        if (e.key === 's' && (e.metaKey || e.ctrlKey)) {
+          e.preventDefault()
+        }
+      },
+      onOpen() {
+        const { type } = this.generateConf
+        this.htmlCode = makeUpHtml(this.formData, type)
+        this.jsCode = makeUpJs(this.formData, type)
+        this.cssCode = makeUpCss(this.formData)
+  
+        loadBeautifier(btf => {
+          beautifier = btf
+          this.htmlCode = beautifier.html(this.htmlCode, beautifierConf.html)
+          this.jsCode = beautifier.js(this.jsCode, beautifierConf.js)
+          this.cssCode = beautifier.css(this.cssCode, beautifierConf.html)
+  
+          loadMonaco(val => {
+            monaco = val
+            this.setEditorValue('editorHtml', 'html', this.htmlCode)
+            this.setEditorValue('editorJs', 'js', this.jsCode)
+            this.setEditorValue('editorCss', 'css', this.cssCode)
+            if (!this.isInitcode) {
+              this.isRefreshCode = true
+              this.isIframeLoaded && (this.isInitcode = true) && this.runCode()
+            }
+          })
+        })
+      },
+      onClose() {
+        this.isInitcode = false
+        this.isRefreshCode = false
+      },
+      iframeLoad() {
+        if (!this.isInitcode) {
+          this.isIframeLoaded = true
+          this.isRefreshCode && (this.isInitcode = true) && this.runCode()
+        }
+      },
+      setEditorValue(id, type, codeStr) {
+        if (editorObj[type]) {
+          editorObj[type].setValue(codeStr)
+        } else {
+          editorObj[type] = monaco.editor.create(document.getElementById(id), {
+            value: codeStr,
+            theme: 'vs-dark',
+            language: mode[type],
+            automaticLayout: true
+          })
+        }
+        // ctrl + s 刷新
+        editorObj[type].onKeyDown(e => {
+          if (e.keyCode === 49 && (e.metaKey || e.ctrlKey)) {
+            this.runCode()
+          }
+        })
+      },
+      runCode() {
+        const jsCodeStr = editorObj.js.getValue()
+        try {
+          const ast = parse(jsCodeStr, { sourceType: 'module' })
+          const astBody = ast.program.body
+          if (astBody.length > 1) {
+            this.$confirm(
+              'js格式不能识别，仅支持修改export default的对象内容',
+              '提示',
+              {
+                type: 'warning'
+              }
+            )
+            return
+          }
+          if (astBody[0].type === 'ExportDefaultDeclaration') {
+            const postData = {
+              type: 'refreshFrame',
+              data: {
+                generateConf: this.generateConf,
+                html: editorObj.html.getValue(),
+                js: jsCodeStr.replace(exportDefault, ''),
+                css: editorObj.css.getValue(),
+                scripts: this.scripts,
+                links: this.links
+              }
+            }
+  
+            this.$refs.previewPage.contentWindow.postMessage(
+              postData,
+              location.origin
+            )
+          } else {
+            this.$message.error('请使用export default')
+          }
+        } catch (err) {
+          this.$message.error(`js错误：${err}`)
+          console.error(err)
+        }
+      },
+      generateCode() {
+        const html = vueTemplate(editorObj.html.getValue())
+        const script = vueScript(editorObj.js.getValue())
+        const css = cssStyle(editorObj.css.getValue())
+        return beautifier.html(html + script + css, beautifierConf.html)
+      },
+      exportFile() {
+        this.$prompt('文件名:', '导出文件', {
+          inputValue: `${+new Date()}.vue`,
+          closeOnClickModal: false,
+          inputPlaceholder: '请输入文件名'
+        }).then(({ value }) => {
+          if (!value) value = `${+new Date()}.vue`
+          const codeStr = this.generateCode()
+          const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
+          saveAs(blob, value)
+        })
+      },
+      showResource() {
+        this.resourceVisible = true
+      },
+      setResource(arr) {
+        const scripts = []; const
+          links = []
+        if (Array.isArray(arr)) {
+          arr.forEach(item => {
+            if (item.endsWith('.css')) {
+              links.push(item)
+            } else {
+              scripts.push(item)
+            }
+          })
+          this.scripts = scripts
+          this.links = links
+        } else {
+          this.scripts = []
+          this.links = []
+        }
+      }
+    }
+  }
+  </script>
+  
+  <style lang="scss" scoped>
+  @import '@/assets/styles/mixin.scss';
+  .tab-editor {
+    position: absolute;
+    top: 33px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    font-size: 14px;
+  }
+  .left-editor {
+    position: relative;
+    height: 100%;
+    background: #1e1e1e;
+    overflow: hidden;
+  }
+  .setting{
+    position: absolute;
+    right: 15px;
+    top: 3px;
+    color: #a9f122;
+    font-size: 18px;
+    cursor: pointer;
+    z-index: 1;
+  }
+  .right-preview {
+    height: 100%;
+    .result-wrapper {
+      height: calc(100vh - 33px);
+      width: 100%;
+      overflow: auto;
+      padding: 12px;
+      box-sizing: border-box;
+    }
+  }
+  @include action-bar;
+  ::v-deep .el-drawer__header {
+    display: none;
+  }
+  </style>
+  

ruoyi-ui/src/views/tool/build/JsonDrawer.vue

@@ -0,0 +1,145 @@
+<template>
+    <div>
+      <el-drawer v-bind="$attrs" v-on="$listeners" @opened="onOpen" @close="onClose">
+        <div class="action-bar" :style="{'text-align': 'left'}">
+          <span class="bar-btn" @click="refresh">
+            <i class="el-icon-refresh" />
+            刷新
+          </span>
+          <span ref="copyBtn" class="bar-btn copy-json-btn">
+            <i class="el-icon-document-copy" />
+            复制JSON
+          </span>
+          <span class="bar-btn" @click="exportJsonFile">
+            <i class="el-icon-download" />
+            导出JSON文件
+          </span>
+          <span class="bar-btn delete-btn" @click="$emit('update:visible', false)">
+            <i class="el-icon-circle-close" />
+            关闭
+          </span>
+        </div>
+        <div id="editorJson" class="json-editor" />
+      </el-drawer>
+    </div>
+  </template>
+  
+  <script>
+  import { beautifierConf } from '@/utils/index'
+  import ClipboardJS from 'clipboard'
+  import { saveAs } from 'file-saver'
+  import loadMonaco from '@/utils/loadMonaco'
+  import loadBeautifier from '@/utils/loadBeautifier'
+  
+  let beautifier
+  let monaco
+  
+  export default {
+    components: {},
+    props: {
+      jsonStr: {
+        type: String,
+        required: true
+      }
+    },
+    data() {
+      return {}
+    },
+    computed: {},
+    watch: {},
+    created() {},
+    mounted() {
+      window.addEventListener('keydown', this.preventDefaultSave)
+      const clipboard = new ClipboardJS('.copy-json-btn', {
+        text: trigger => {
+          this.$notify({
+            title: '成功',
+            message: '代码已复制到剪切板，可粘贴。',
+            type: 'success'
+          })
+          return this.beautifierJson
+        }
+      })
+      clipboard.on('error', e => {
+        this.$message.error('代码复制失败')
+      })
+    },
+    beforeDestroy() {
+      window.removeEventListener('keydown', this.preventDefaultSave)
+    },
+    methods: {
+      preventDefaultSave(e) {
+        if (e.key === 's' && (e.metaKey || e.ctrlKey)) {
+          e.preventDefault()
+        }
+      },
+      onOpen() {
+        loadBeautifier(btf => {
+          beautifier = btf
+          this.beautifierJson = beautifier.js(this.jsonStr, beautifierConf.js)
+  
+          loadMonaco(val => {
+            monaco = val
+            this.setEditorValue('editorJson', this.beautifierJson)
+          })
+        })
+      },
+      onClose() {},
+      setEditorValue(id, codeStr) {
+        if (this.jsonEditor) {
+          this.jsonEditor.setValue(codeStr)
+        } else {
+          this.jsonEditor = monaco.editor.create(document.getElementById(id), {
+            value: codeStr,
+            theme: 'vs-dark',
+            language: 'json',
+            automaticLayout: true
+          })
+          // ctrl + s 刷新
+          this.jsonEditor.onKeyDown(e => {
+            if (e.keyCode === 49 && (e.metaKey || e.ctrlKey)) {
+              this.refresh()
+            }
+          })
+        }
+      },
+      exportJsonFile() {
+        this.$prompt('文件名:', '导出文件', {
+          inputValue: `${+new Date()}.json`,
+          closeOnClickModal: false,
+          inputPlaceholder: '请输入文件名'
+        }).then(({ value }) => {
+          if (!value) value = `${+new Date()}.json`
+          const codeStr = this.jsonEditor.getValue()
+          const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
+          saveAs(blob, value)
+        })
+      },
+      refresh() {
+        try {
+          this.$emit('refresh', JSON.parse(this.jsonEditor.getValue()))
+        } catch (error) {
+          this.$notify({
+            title: '错误',
+            message: 'JSON格式错误，请检查',
+            type: 'error'
+          })
+        }
+      }
+    }
+  }
+  </script>
+  
+  <style lang="scss" scoped>
+  @import '@/assets/styles/mixin.scss';
+  
+  ::v-deep .el-drawer__header {
+    display: none;
+  }
+  @include action-bar;
+  
+  .json-editor{
+    height: calc(100vh - 33px);
+  }
+  </style>
+  

ruoyi-ui/src/views/tool/build/ResourceDialog.vue

@@ -0,0 +1,117 @@
+<template>
+    <div>
+      <el-dialog
+        v-bind="$attrs"
+        title="外部资源引用"
+        width="600px"
+        :close-on-click-modal="false"
+        v-on="$listeners"
+        @open="onOpen"
+        @close="onClose"
+      >
+        <el-input
+          v-for="(item, index) in resources"
+          :key="index"
+          v-model="resources[index]"
+          class="url-item"
+          placeholder="请输入 css 或 js 资源路径"
+          prefix-icon="el-icon-link"
+          clearable
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-delete"
+            @click="deleteOne(index)"
+          />
+        </el-input>
+        <el-button-group class="add-item">
+          <el-button
+            plain
+            @click="addOne('https://lib.baomitu.com/jquery/1.8.3/jquery.min.js')"
+          >
+            jQuery1.8.3
+          </el-button>
+          <el-button
+            plain
+            @click="addOne('https://unpkg.com/http-vue-loader')"
+          >
+            http-vue-loader
+          </el-button>
+          <el-button
+            icon="el-icon-circle-plus-outline"
+            plain
+            @click="addOne('')"
+          >
+            添加其他
+          </el-button>
+        </el-button-group>
+        <div slot="footer">
+          <el-button @click="close">
+            取消
+          </el-button>
+          <el-button
+            type="primary"
+            @click="handelConfirm"
+          >
+            确定
+          </el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  <script>
+  import { deepClone } from '@/utils/index'
+  
+  export default {
+    components: {},
+    inheritAttrs: false,
+    props: ['originResource'],
+    data() {
+      return {
+        resources: null
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {},
+    mounted() {},
+    methods: {
+      onOpen() {
+        this.resources = this.originResource.length ? deepClone(this.originResource) : ['']
+      },
+      onClose() {
+      },
+      close() {
+        this.$emit('update:visible', false)
+      },
+      handelConfirm() {
+        const results = this.resources.filter(item => !!item) || []
+        this.$emit('save', results)
+        this.close()
+        if (results.length) {
+          this.resources = results
+        }
+      },
+      deleteOne(index) {
+        this.resources.splice(index, 1)
+      },
+      addOne(url) {
+        if (this.resources.indexOf(url) > -1) {
+          this.$message('资源已存在')
+        } else {
+          this.resources.push(url)
+        }
+      }
+    }
+  }
+  
+  </script>
+  <style lang="scss" scoped>
+  .add-item{
+    margin-top: 8px;
+  }
+  .url-item{
+    margin-bottom: 12px;
+  }
+  </style>
+  

ruoyi-work/pom.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.6.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-work</artifactId>
+
+    <description>
+        work模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+<!--        转驼峰需要用到-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-sms</artifactId>
+        </dependency>-->
+
+        <!-- 短信 用哪个导入哪个依赖 -->
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>dysmsapi20170525</artifactId>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.tencentcloudapi</groupId>-->
+<!--            <artifactId>tencentcloud-sdk-java-sms</artifactId>-->
+<!--        </dependency>-->
+
+    </dependencies>
+
+</project>

ruoyi-work/src/main/resources/mapper/package-info.md

@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件