cloud-web-corejs-haier 1.0.20 → 1.0.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs-haier",
   "private": false,
-  "version": "1.0.20",
+  "version": "1.0.21",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/code-editor/index.vue

@@ -2,85 +2,124 @@
   <div class="ace-container">
     <!-- 官方文档中使用id，这里禁止使用，在后期打包后容易出现问题，使用 ref 或者 DOM 就行 -->
     <div class="ace-editor" ref="ace" :style="editorStyle"></div>
+    <template v-if="resize">
+      <div id="editor-resize-bar" @mousedown="btnMouseDown"></div>
+      <div class="icon-drag" @mousedown="btnMouseDown"></div>
+    </template>
   </div>
 </template>
 
 <script>
-import ace from 'ace-builds';
+import ace from "ace-builds";
 /* 启用此行后webpack打包回生成很多动态加载的js文件，不便于部署，故禁用！！
      特别提示：禁用此行后，需要调用ace.config.set('basePath', 'path...')指定动态js加载URL！！
    */
 //import 'ace-builds/webpack-resolver'
 
 //import 'ace-builds/src-min-noconflict/theme-monokai' // 默认设置的主题
-import 'ace-builds/src-min-noconflict/theme-sqlserver'; // 新设主题
-import 'ace-builds/src-min-noconflict/mode-javascript'; // 默认设置的语言模式
-import 'ace-builds/src-min-noconflict/mode-json'; //
-import 'ace-builds/src-min-noconflict/mode-css'; //
-import 'ace-builds/src-min-noconflict/mode-java'; //
-import 'ace-builds/src-min-noconflict/ext-language_tools';
-const ACE_BASE_PATH = window.WEB_PREFIX + '/base/ace/src-min-noconflict'
-
+import "ace-builds/src-min-noconflict/theme-sqlserver"; // 新设主题
+import "ace-builds/src-min-noconflict/mode-javascript"; // 默认设置的语言模式
+import "ace-builds/src-min-noconflict/mode-json"; //
+import "ace-builds/src-min-noconflict/mode-css"; //
+import "ace-builds/src-min-noconflict/mode-java"; //
+import "ace-builds/src-min-noconflict/ext-language_tools";
+const ACE_BASE_PATH = window.WEB_PREFIX + "/base/ace/src-min-noconflict";
+import indexUtil from "../../utils/index.js";
 export default {
-  name: 'CodeEditor',
+  name: "CodeEditor",
   props: {
     value: {
       type: String,
-      default: ''
+      default: "",
     },
     readonly: {
       type: Boolean,
-      default: false
+      default: false,
     },
     mode: {
       type: String,
-      default: 'javascript'
+      default: "javascript",
     },
     userWorker: {
       //是否开启语法检查，默认开启
       type: Boolean,
-      default: true
+      default: true,
     },
     maxLines: {
       type: Number,
-      default: 20
+      default: 20,
     },
     minLines: {
       type: Number,
-      default: 20
+      default: 20,
     },
     height: {
       type: String,
-      default: '280px;'
+      default: "450px;",
+    },
+    resize: {
+      //是否开启语法检查，默认开启
+      type: Boolean,
+      default: true,
     },
   },
   computed: {
-    editorStyle:function(){
-      return 'height:'+this.height;
+    editorStyle: function () {
+      return "height:" + this.height;
     },
-    modePath: function() {
-      return 'ace/mode/' + this.mode;
+    modePath: function () {
+      return "ace/mode/" + this.mode;
     },
-    acData: function() {
+    acData: function () {
       let acData = [];
-      if (this.mode == 'javascript') {
+      if (this.mode == "javascript") {
         acData = [
-          { meta: 'VForm API', caption: 'getWidgetRef', value: 'getWidgetRef()', score: 1 },
-          { meta: 'VForm API', caption: 'getFormRef', value: 'getFormRef()', score: 1 },
-          { meta: 'VForm API', caption: 'addExtraAccessData', value: 'addExtraAccessData()', score: 1 },
-          { meta: 'VForm API', caption: 'clearExtraAccessData', value: 'clearExtraAccessData()', score: 1 },
-          { meta: 'snippet', caption: 'setInterval', value: 'setInterval(function() {}, 5000);', score: 1 },
-          { meta: 'VForm API', caption: 'getFormParam', value: 'getFormParam()', score: 1 },
-          { meta: 'VForm API', caption: 'getGlobalConfig', value: 'getGlobalConfig()', score: 1 },
+          {
+            meta: "VForm API",
+            caption: "getWidgetRef",
+            value: "getWidgetRef()",
+            score: 1,
+          },
+          { meta: "VForm API", caption: "getFormRef", value: "getFormRef()", score: 1 },
+          {
+            meta: "VForm API",
+            caption: "addExtraAccessData",
+            value: "addExtraAccessData()",
+            score: 1,
+          },
+          {
+            meta: "VForm API",
+            caption: "clearExtraAccessData",
+            value: "clearExtraAccessData()",
+            score: 1,
+          },
+          {
+            meta: "VForm API",
+            caption: "getFormParam",
+            value: "getFormParam()",
+            score: 1,
+          },
+          {
+            meta: "VForm API",
+            caption: "getGlobalConfig",
+            value: "getGlobalConfig()",
+            score: 1,
+          },
+          {
+            meta: "snippet",
+            caption: "setInterval",
+            value: "setInterval(function() {}, 5000);",
+            score: 1,
+          },
           //TODO: 待补充！！
         ];
       }
       return acData;
-    }
+    },
   },
   mounted() {
     //ace.config.set('basePath', 'https://ks3-cn-beijing.ksyun.com/vform2021/ace')
-    ace.config.set('basePath', ACE_BASE_PATH);
+    ace.config.set("basePath", ACE_BASE_PATH);
 
     this.addAutoCompletion(ace); //添加自定义代码提示！！
 
@@ -93,18 +132,18 @@ export default {
       tabSize: 2, // 制表符设置为2个空格大小
       readOnly: this.readonly,
       highlightActiveLine: true,
-      value: this.codeValue
+      value: this.codeValue,
     });
 
     this.aceEditor.setOptions({
       enableBasicAutocompletion: true,
       enableSnippets: true, // 设置代码片段提示
-      enableLiveAutocompletion: true // 设置自动提示
+      enableLiveAutocompletion: true, // 设置自动提示
     });
 
-    if (this.mode === 'json') {
+    if (this.mode === "json") {
       this.setJsonMode();
-    } else if (this.mode === 'css') {
+    } else if (this.mode === "css") {
       this.setCssMode();
     }
 
@@ -113,54 +152,100 @@ export default {
     }
 
     //编辑时同步数据
-    this.aceEditor.getSession().on('change', ev => {
+    this.aceEditor.getSession().on("change", (ev) => {
       //this.$emit('update:value', this.aceEditor.getValue())  // 触发更新事件, 实现.sync双向绑定！！
-      this.$emit('input', this.aceEditor.getValue());
+      this.$emit("input", this.aceEditor.getValue());
     });
   },
   data() {
     return {
       aceEditor: null,
-      themePath: 'ace/theme/sqlserver', // 不导入 webpack-resolver，该模块路径会报错
+      themePath: "ace/theme/sqlserver", // 不导入 webpack-resolver，该模块路径会报错
       // modePath: 'ace/mode/javascript', // 同上
-      codeValue: this.value || ''
+      codeValue: this.value || "",
     };
   },
-  watch: {
-
-  },
+  watch: {},
   methods: {
     addAutoCompletion(ace) {
       let acData = this.acData;
-      let langTools = ace.require('ace/ext/language_tools');
+      let langTools = ace.require("ace/ext/language_tools");
       langTools.addCompleter({
-        getCompletions: function(editor, session, pos, prefix, callback) {
+        getCompletions: function (editor, session, pos, prefix, callback) {
           if (prefix.length === 0) {
             return callback(null, []);
           } else {
             return callback(null, acData);
           }
-        }
+        },
       });
     },
 
     setJsonMode() {
-      this.aceEditor.getSession().setMode('ace/mode/json');
+      this.aceEditor.getSession().setMode("ace/mode/json");
     },
 
     setCssMode() {
-      this.aceEditor.getSession().setMode('ace/mode/css');
+      this.aceEditor.getSession().setMode("ace/mode/css");
     },
 
     getEditorAnnotations() {
       return this.aceEditor.getSession().getAnnotations();
     },
-    setValue(val){
+    setValue(val) {
       this.aceEditor.setValue(val);
-    }
-  }
+    },
+    btnMouseDown(event) {
+      let rootDom = document.body.querySelector("#app");
+      indexUtil.addClass(rootDom, "ns-resize-ing");
+      const editor = this.aceEditor;
+      const startY = event.clientY;
+      const startHeight = editor.container.clientHeight;
+
+      const onMouseMove = (moveEvent) => {
+        const deltaY = moveEvent.clientY - startY;
+        editor.container.style.height = startHeight + deltaY + "px";
+      };
+
+      const onMouseUp = () => {
+        indexUtil.removeClass(rootDom, "ns-resize-ing");
+        document.removeEventListener("mousemove", onMouseMove);
+        document.removeEventListener("mouseup", onMouseUp);
+        editor.resize();
+        editor.focus();
+      };
+
+      document.addEventListener("mousemove", onMouseMove);
+      document.addEventListener("mouseup", onMouseUp);
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
+#editor-resize-bar {
+  width: 100%;
+  height: 5px;
+  cursor: ns-resize;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
+.ace-container {
+  position: relative;
+  .icon-drag {
+    position: absolute;
+    right: 3px;
+    bottom: 3px;
+    font-family: "iconfont";
+    font-size: 10px;
+    cursor: n-resize;
+    width: 12px;
+    height: 12px;
+    line-height: 12px;
+    &:before {
+      content: "\e61e";
+    }
+  }
+}
 </style>

package/src/components/fileLibrary/index.vue

@@ -31,7 +31,7 @@
           icon="el-icon-edit-outline"
           class="btn"
           @click="editFileCategory()"
-          :disabled="currentFileCategory == null || !currentFileCategory.id"
+          :disabled="currentFileCategory === null || !currentFileCategory.id"
           v-if="fileObjAuth.editAuth"
         >
           {{ $t2("编辑", "components.fileLibrary.editCategory") }}
@@ -303,7 +303,7 @@
               icon="iconfont icon-icmenu2"
               @click="changeShowType()"
               class="button-sty icon-btn"
-              v-show="showType == 1"
+              v-show="showType === 1"
               >{{ $t2("列表", "components.fileLibrary.tableList") }}
             </el-button>
             <el-button
@@ -312,7 +312,7 @@
               icon="el-icon-menu"
               @click="changeShowType()"
               class="button-sty icon-btn"
-              v-show="showType == 2"
+              v-show="showType === 2"
               >{{ $t2("图示", "components.fileLibrary.imageList") }}
             </el-button>
           </div>
@@ -321,7 +321,7 @@
         <div
           class="containter1"
           ref="containter1"
-          v-show="showType == 1"
+          v-show="showType === 1"
           style="overflow: auto"
         >
           <div class="annex-piclist">
@@ -458,7 +458,7 @@
                     </div> -->
                     <div
                       class="status s-1"
-                      v-if="!attachment.dirs && attachment.status == 1"
+                      v-if="!attachment.dirs && attachment.status === 1"
                     ></div>
                     <div
                       class="img"
@@ -535,7 +535,7 @@
         </div>
         <div class="annex-grid-height">
           <vxe-grid
-            v-show="showType == 2"
+            v-show="showType === 2"
             ref="table-m1"
             v-bind="vxeOption"
             :data="page.records"
@@ -574,7 +574,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && fileObjAuth.editAuth == 1"
+                  v-if="isEdit && fileObjAuth.editAuth === 1"
                   @click="openPropertiesDialog(row)"
                 >
                   <el-tooltip
@@ -590,7 +590,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="fileObjAuth.downloadAuth == 1"
+                  v-if="fileObjAuth.downloadAuth === 1"
                   @click="downloadSingerFile(row)"
                 >
                   <el-tooltip
@@ -606,7 +606,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="fileObjAuth.shareAuth == 1"
+                  v-if="fileObjAuth.shareAuth === 1"
                   @click="openShareDialog(row)"
                 >
                   <el-tooltip
@@ -622,7 +622,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.replaceAuth == 1"
+                  v-if="isEdit && row.status != 1 && fileObjAuth.replaceAuth === 1"
                   @click="replaceFile(row, rowIndex, items)"
                 >
                   <el-tooltip
@@ -638,7 +638,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.historyAuth == 1"
+                  v-if="isEdit && row.status != 1 && fileObjAuth.historyAuth === 1"
                   @click="openFileHistoryDialog(row)"
                 >
                   <el-tooltip
@@ -654,7 +654,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.deleteAuth == 1"
+                  v-if="isEdit && row.status != 1 && fileObjAuth.deleteAuth === 1"
                   @click="deleteAttach(row)"
                 >
                   <el-tooltip
@@ -672,7 +672,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && isCategoryEdit && fileObjAuth.editAuth == 1"
+                  v-if="isEdit && isCategoryEdit && fileObjAuth.editAuth === 1"
                   @click="editFileCategory(row)"
                 >
                   <el-tooltip
@@ -688,7 +688,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && isCategoryEdit && fileObjAuth.deleteDirAuth == 1"
+                  v-if="isEdit && isCategoryEdit && fileObjAuth.deleteDirAuth === 1"
                   @click="deleteAttach(row)"
                 >
                   <el-tooltip
@@ -776,6 +776,9 @@
             >
               <el-input v-model="editCategory.fileName" clearable class="all-width" />
             </el-form-item>
+            <el-form-item :label="$t1('关联编码')">
+              <el-input v-model="editCategory.relationCode" clearable class="all-width" />
+            </el-form-item>
           </el-form>
         </div>
         <span slot="footer" class="dialog-footer">

package/src/components/fileLibrary/mixins/categoryMoveDialogMixins.js

@@ -1,5 +1,5 @@
 let modules;
-import {treeScolly} from "../../../utils/global.js";
+import {treeScolly} from "@base/utils/global.js";
 
 modules = {
   props: {

package/src/components/fileLibrary/mixins/fileCategoryDialogMixins.js

@@ -1,5 +1,5 @@
 let modules;
-import {treeScolly} from "../../../utils/global.js";
+import {treeScolly} from "@base/utils/global.js";
 
 modules = {
   props: {

package/src/components/fileLibrary/mixins/fileHistoryDialogMixins.js

@@ -1,5 +1,5 @@
-import {selectDialogMixins} from '../../../mixins/selectDialog/index.js';
-import ElImageViewer from '../../../components/VabUpload/image-viewer';
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import ElImageViewer from '@base/components/VabUpload/image-viewer';
 
 let modules;
 modules = {