cloud-web-corejs 1.0.54-dev.507 → 1.0.54-dev.509

package/package.json

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

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

@@ -1,9 +1,7 @@
 <template>
   <div class="ace-container">
     <!-- 官方文档中使用id，这里禁止使用，在后期打包后容易出现问题，使用 ref 或者 DOM 就行 -->
-    <div class="ace-editor" ref="ace" :style="editorStyle">
-
-    </div>
+    <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>
@@ -12,84 +10,116 @@
 </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 indexUtil from "../../utils/index.js"
+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: '450px;'
+      default: "450px;",
     },
     resize: {
       //是否开启语法检查，默认开启
       type: Boolean,
-      default: true
+      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: "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); //添加自定义代码提示！！
 
@@ -102,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();
     }
 
@@ -122,75 +152,73 @@ 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){
+    btnMouseDown(event) {
       let rootDom = document.body.querySelector("#app");
       indexUtil.addClass(rootDom, "ns-resize-ing");
-      const editor = this.aceEditor
+      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';
+        editor.container.style.height = startHeight + deltaY + "px";
       };
 
       const onMouseUp = () => {
         indexUtil.removeClass(rootDom, "ns-resize-ing");
-        document.removeEventListener('mousemove', onMouseMove);
-        document.removeEventListener('mouseup', onMouseUp);
+        document.removeEventListener("mousemove", onMouseMove);
+        document.removeEventListener("mouseup", onMouseUp);
         editor.resize();
         editor.focus();
       };
 
-      document.addEventListener('mousemove', onMouseMove);
-      document.addEventListener('mouseup', onMouseUp);
-    }
-  }
+      document.addEventListener("mousemove", onMouseMove);
+      document.addEventListener("mouseup", onMouseUp);
+    },
+  },
 };
 </script>
 
@@ -204,9 +232,20 @@ export default {
   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";}
+  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/errorMsg/index.vue

@@ -16,55 +16,63 @@
         <p v-if="!rmid">Error：</p>
         <p v-if="rmid">Error（{{ rmid }}）：</p>
         <template v-if="!showTextFlag">
-          <p>{{ text1 }}</p>
+          <p v-html="text1"></p>
         </template>
         <p v-if="showTextFlag" v-html="text2"></p>
-        <a href="javascript:void(0);" @click="showTextFlag=!showTextFlag">{{
-            !showTextFlag ? $t2('详情', 'components.errorMsg.detail') : $t2('收起', 'components.errorMsg.collapse')
-          }}</a>
+        <a href="javascript:void(0);" @click="showTextFlag = !showTextFlag">{{
+          !showTextFlag
+            ? $t2("详情", "components.errorMsg.detail")
+            : $t2("收起", "components.errorMsg.collapse")
+        }}</a>
       </div>
       <span slot="footer" class="dialog-footer">
-      <input type="text" ref="hbtn" style="position: absolute;left: -999px;top: -999px;" />
-	    <el-button type="primary" @click="claoseDialog" class="button-sty"><i
-        class="el-icon-check el-icon"></i>{{ $t2('确 定', 'system.button.confirm2') }}</el-button>
-	  </span>
+        <input
+          type="text"
+          ref="hbtn"
+          style="position: absolute; left: -999px; top: -999px"
+        />
+        <el-button type="primary" @click="claoseDialog" class="button-sty"
+          ><i class="el-icon-check el-icon"></i
+          >{{ $t2("确 定", "system.button.confirm2") }}</el-button
+        >
+      </span>
     </el-dialog>
   </div>
   <div v-else-if="showWrap">
-      <div class="pop-tipsBox error" :style="'display: block;z-index:'+zIndex">
-        <div>
-          <i class="icon"></i>
-          <div class="cont">
-            <p class="name">{{title}}</p>
-            <p class="txt" v-if="!rmid">Error：</p>
-            <p class="txt" v-if="rmid">Error（{{ rmid }}）：</p>
-            <template v-if="!showTextFlag">
-              <p class="txt">{{ text1 }}</p>
-            </template>
-            <p class="txt" v-if="showTextFlag" v-html="text2"></p>
-            <a href="javascript:void(0);" @click="showTextFlag=!showTextFlag">{{
-                !showTextFlag ? $t2('详情', 'components.errorMsg.detail') : $t2('收起', 'components.errorMsg.collapse')
-              }}</a>
-
-          </div>
-          <div class="btns">
-            <el-button type="primary" class="btn" @click="claoseDialog">{{ $t2('确 定', 'system.button.confirm2') }}</el-button>
-          </div>
+    <div class="pop-tipsBox error" :style="'display: block;z-index:' + zIndex">
+      <div>
+        <i class="icon"></i>
+        <div class="cont">
+          <p class="name">{{ title }}</p>
+          <p class="txt" v-if="!rmid">Error：</p>
+          <p class="txt" v-if="rmid">Error（{{ rmid }}）：</p>
+          <template v-if="!showTextFlag">
+            <p class="txt">{{ text1 }}</p>
+          </template>
+          <p class="txt" v-if="showTextFlag" v-html="text2"></p>
+          <a href="javascript:void(0);" @click="showTextFlag = !showTextFlag">{{
+            !showTextFlag
+              ? $t2("详情", "components.errorMsg.detail")
+              : $t2("收起", "components.errorMsg.collapse")
+          }}</a>
+        </div>
+        <div class="btns">
+          <el-button type="primary" class="btn" @click="claoseDialog">{{
+            $t2("确 定", "system.button.confirm2")
+          }}</el-button>
         </div>
       </div>
+    </div>
   </div>
 </template>
 
 <script>
-import {
-  mixins
-} from './mixins'
+import { mixins } from "./mixins";
 
 export default {
   // name: 'errorMsg',
-  mixins: [mixins]
-}
+  mixins: [mixins],
+};
 </script>
 
-<style>
-</style>
+<style></style>

package/src/components/xform/form-designer/designer.js

@@ -96,7 +96,8 @@ let chartContainers = [],
         wfTheme: null,
         otherTabEnabled:false,
         otherTabList:[],
-        customListTabLabel: null
+        customListTabLabel: null,
+        globalConfig: null
       },
       dataSources: [], //数据源
 

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -20,6 +20,16 @@
               placeholder="默认saveUpdatge"
             ></el-input>
           </el-form-item>
+          <el-form-item label="全局参数配置">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormEventHandler('globalConfig')"
+            >
+              <span>{{ formConfig.globalConfig }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
           <el-form-item :label="i18nt('designer.setting.globalFunctions')">
             <a
               href="javascript:void(0);"
@@ -911,6 +921,7 @@ export default {
         onFormDataChange:
           "onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {",
         wfConfig: "wfConfig(dataId, formCode, formData) {",
+        globalConfig: "globalConfig(dataId, formCode) {",
         //'onFormValidate':     'onFormValidate() {',
       },
       showVabsearchConfigDialog: false,
@@ -933,6 +944,8 @@ export default {
       showBdCompanyEnvDialog1: false,
       showBdCompanyEnvDialog2: false,
 
+      globalConfigParams: ["dataId", "formCode"],
+
       tip1: `流程主题表达式设置说明。
 
 1、可使用参数：

package/src/components/xform/form-render/indexMixin.js

@@ -212,6 +212,7 @@ modules = {
       formulaDialogVisible: false,
       baseFormulaDialogOption: null,
       baseFormulaDialogVisible: false,
+      globalConfig: {}
     };
   },
   computed: {
@@ -265,6 +266,7 @@ modules = {
     await this.initUserRoleData();
     await this.initBdService();
     // this.handleAllTableColumnWidget();
+    this.initGlobalConfig();//初始化全局配置
     this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
     // this.hanldeCommonWidget();//处理组件显隐规则
     if (formConfig.isLoadEntity) {
@@ -284,6 +286,13 @@ modules = {
     this.handleOnMounted();
   },
   methods: {
+    initGlobalConfig(){
+      //初始化全局配置
+      this.globalConfig = this.handleCustomEvent(
+        this.formConfig.globalConfig
+      ) || {};
+
+    },
     /**
      * 数据对象key 驼峰下划线相互转化
      * @param {Object} data - 原始对象 支持-数组、key-value对象、字符串