cloud-web-corejs 1.0.261 → 1.0.263

package/package.json

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

package/src/components/xform/form-designer/form-widget/field-widget/cascader-widget.vue

@@ -9,7 +9,10 @@
                  :size="field.options.size"
                  :clearable="field.options.clearable"
                  :filterable="field.options.filterable"
-                 :props="{ checkStrictly: field.options.checkStrictly, multiple: field.options.multiple, expandTrigger: 'hover' }"
+                 :collapse-tags="!field.options.flatCollapseTags"
+                 :show-all-levels="showFullPath"
+                 :props="{ checkStrictly: field.options.checkStrictly, multiple: field.options.multiple, expandTrigger: 'hover',
+                           value: valueKey, label: labelKey, children: childrenKey }"
                  @visible-change="hideDropDownOnClick" @expand-change="hideDropDownOnClick"
                  :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
                  @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
@@ -69,7 +72,34 @@
       }
     },
     computed: {
+      labelKey() {
+        return this.field.options.labelKey || 'label'
+      },
+
+      valueKey() {
+        return this.field.options.valueKey || 'value'
+      },
+
+      childrenKey() {
+        return this.field.options.childrenKey || 'children'
+      },
 
+      showFullPath() {
+        return this.field.options.showAllLevels === undefined || !!this.field.options.showAllLevels
+      },
+
+      contentForReadMode() {
+        if (!!this.field.options.multiple) {
+          const curTags = this.$refs.fieldEditor.presentTags
+          if (!curTags || (curTags.length <= 0)) {
+            return '--'
+          } else {
+            return curTags.map(tagItem => tagItem.text).join(', ')
+          }
+        } else {
+          return this.$refs.fieldEditor.presentText || '--'
+        }
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,9 +108,9 @@
     created() {
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
+      this.registerToRefList()
       this.initOptionItems()
       this.initFieldModel()
-      this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()
 
@@ -106,19 +136,6 @@
           })
         }, 100)
       },
-      contentForReadMode() {
-        if (!!this.field.options.multiple) {
-          //console.log('test======', this.$refs.fieldEditor.presentTags)
-          const curTags = this.$refs.fieldEditor.presentTags
-          if (!curTags || (curTags.length <= 0)) {
-            return '--'
-          } else {
-            return curTags.map(tagItem => tagItem.text).join(', ')
-          }
-        } else {
-          return this.$refs.fieldEditor.presentText || '--'
-        }
-      },
 
     }
   }

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -1466,12 +1466,13 @@ modules = {
         e,
         this.field.type,
         this.getOptionItemLabelKey(),
-        this.getOptionItemValueKey()()
+        this.getOptionItemValueKey()
       );
       // this.field.options.optionItems = optionItems
       this.setOptionItems(optionItems)
     },
     loadOptions: function (e, rowOptionFlag) {
+      debugger
       let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,

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

@@ -65,6 +65,12 @@
         :disabled="optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled"
       ></el-input>
     </el-form-item>
+    <el-form-item
+      v-if="hasConfig('childrenKey')"
+      :label="i18nt('designer.setting.childrenKeyName')"
+    >
+      <el-input v-model="optionModel.childrenKey"></el-input>
+    </el-form-item>
     <template
       v-if="!optionModel.commonAttributeEnabled && !optionModel.formScriptEnabled"
     >
@@ -305,11 +311,12 @@
 <script>
 import Draggable from "vuedraggable";
 import i18n from "../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
 
 export default {
   name: "OptionItemsSetting",
   componentName: "PropertyEditor",
-  mixins: [i18n],
+  mixins: [i18n, propertyMixin],
   components: {
     Draggable,
   },

package/src/components/xform/form-designer/setting-panel/property-editor/field-cascader/cascader-multiple-editor.vue

@@ -1,7 +1,12 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.multiple')">
-    <el-switch v-model="optionModel.multiple"></el-switch>
-  </el-form-item>
+  <div>
+    <el-form-item :label="i18nt('designer.setting.multiple')">
+      <el-switch v-model="optionModel.multiple"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('平铺选项')">
+      <el-switch v-model="optionModel.flatCollapseTags"></el-switch>
+    </el-form-item>
+  </div>
 </template>
 
 <script>

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

@@ -87,6 +87,7 @@ export default {
         "census",
         "status",
         "gantt",
+        "cascader",
       ],
     };
   },

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -49,6 +49,7 @@ const COMMON_PROPERTIES = {
   'remote': 'remote-editor',
   'automaticDropdown': 'automaticDropdown-editor',
   'checkStrictly': 'checkStrictly-editor',
+  'showAllLevels': 'showAllLevels-editor',
   'multiple': 'multiple-editor',
   'multipleLimit': 'multipleLimit-editor',
   'contentPosition': 'contentPosition-editor',

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3535,6 +3535,68 @@ export const advancedFields = [
       showRules: [],
     },
   },
+  {
+    type: "cascader",
+    icon: "cascader-field",
+    commonFlag: !0,
+    formItemFlag: true,
+    options: {
+      name: "",
+      keyNameEnabled: false,
+      keyName: "", //数据键值名称
+      label: "",
+      labelAlign: "",
+      defaultValue: "",
+      placeholder: "",
+      size: "",
+      labelWidth: null,
+      labelHidden: false,
+      columnWidth: "200px",
+      disabled: false,
+      hidden: false,
+      clearable: true,
+      filterable: false,
+      multiple: false,
+      flatCollapseTags: false,
+      checkStrictly: false, //可选择任意一级选项，默认不开启
+      showAllLevels: true, //显示完整路径
+      dsEnabled: false, // 是否使用数据源数据
+      dsName: "", // 数据源名称
+      dataSetName: "", //数据集名称
+      labelKey: "label",
+      valueKey: "value",
+      childrenKey: "children",
+      optionItems: [
+        {
+          label: "select 1",
+          value: 1,
+          children: [{ label: "child 1", value: 11 }],
+        },
+        { label: "select 2", value: 2 },
+        { label: "select 3", value: 3 },
+      ],
+      required: false,
+      requiredHint: "",
+      customRule: "",
+      customRuleHint: "",
+      //-------------------
+      customClass: "", //自定义css类名
+      labelIconClass: null,
+      labelIconPosition: "rear",
+      labelTooltip: null,
+
+      ...httpConfig,
+      ...defaultWfConfig,
+      formScriptEnabled: false,
+      //-------------------
+      onCreated: "",
+      onMounted: "",
+      onChange: "",
+      onFocus: "",
+      onBlur: "",
+      onValidate: "",
+    },
+  },
 ];
 
 export const businessFields = [

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

@@ -266,6 +266,10 @@ modules = {
         ? this.formConfig.customClass
         : "";
     },
+
+    formModel() {
+      return this.formDataModel;
+    },
   },
   watch: {
     //

package/src/components/xform/lang/zh-CN.js

@@ -364,6 +364,7 @@ export default {
       multiple: "选项可多选",
       multipleLimit: "多选数量限制",
       checkStrictly: "任意级节点可选",
+      showAllLevels: "显示完整路径",
       contentPosition: "文字位置",
       dividerDirection: "分割线方向",
       plain: "朴素按钮",

package/src/components/xform/utils/util.js

@@ -197,27 +197,25 @@ export const insertCustomCssToHead = function (cssCode, formId = "") {
   head.appendChild(newStyle);
 };
 
-export const insertGlobalFunctionsToHtml = function (
-  functionsCode,
-  formId = ""
-) {
-  let bodyEle = document.getElementsByTagName("body")[0];
-  let oldScriptEle = document.getElementById("v_form_global_functions");
-  !!oldScriptEle && bodyEle.removeChild(oldScriptEle); //先清除后插入！！
-  if (!!formId) {
-    oldScriptEle = document.getElementById(
-      "v_form_global_functions" + "-" + formId
-    );
-    !!oldScriptEle && bodyEle.removeChild(oldScriptEle); //先清除后插入！！
-  }
-
-  let newScriptEle = document.createElement("script");
-  newScriptEle.id = !!formId
-    ? "v_form_global_functions" + "-" + formId
-    : "v_form_global_functions";
-  newScriptEle.type = "text/javascript";
-  newScriptEle.innerHTML = functionsCode;
-  bodyEle.appendChild(newScriptEle);
+export const insertGlobalFunctionsToHtml = function (
+  functionsCode,
+  formId = ""
+) {
+  if (!functionsCode || typeof functionsCode !== "string") {
+    return;
+  }
+  let sourceName = !!formId
+    ? "v_form_global_functions" + "-" + formId
+    : "v_form_global_functions";
+  try {
+    // (0, eval) 是间接调用形式，不可简写为 eval(...)：直接 eval 会继承当前模块作用域，
+    // 函数声明将落在模块内而非真实 window 上。sourceURL 让 devtools 里可定位、可下断点。
+    (0, eval)(functionsCode + "\n//# sourceURL=" + sourceName + ".js");
+  } catch (e) {
+    // 原先 <script> 注入时语法/运行时错误只进 window.onerror、不影响表单渲染，
+    // 这里必须同样吞掉：否则会中断 initFormObject 整条表单初始化链路
+    console.error("[xform] 表单全局函数执行失败：" + sourceName, e);
+  }
 };
 
 export const optionExists = function (optionsObj, optionName) {

package/src/layout/components/AppMain.vue

@@ -4,7 +4,7 @@
 <!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
 
       <BaseKeepAlive :include="cachedViews">
-        <router-view :key="$route.path" v-if="$route.name !== 'outLink'" />
+        <router-view :key="key" v-if="$route.name !== 'outLink'" />
       </BaseKeepAlive>
 
     </transition>
@@ -28,6 +28,7 @@
 import outLink from '@base/views/user/outLink/index.vue';
 import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
 import watermark from "./watermark";
+import { isRepeatable } from "@base/utils/repeatOpen";
 
 
 export default {
@@ -37,7 +38,9 @@ export default {
       return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
     },
     key() {
-      return this.$route.path;
+      // 可重复打开的路由按 fullPath 作为 key，使多开实例相互独立；
+      // 其余保持按 path，行为与原来一致。
+      return isRepeatable(this.$route) ? this.$route.fullPath : this.$route.path;
     },
     outVisitedViews() {
       let visitedViews = this.$store.state.tagsView.visitedViews;
@@ -83,7 +86,8 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 45= navbar  45  */
-  min-height: calc(100vh - 45px);
+  /**min-height: calc(100vh - 45px);*/
+  height:calc(100vh - 10px);
   width: 100%;
   position: relative;
   overflow: hidden;

package/src/layout/components/Sidebar/default.vue

@@ -609,7 +609,8 @@ export default {
             query: { url: route.outLink, route: route.route },
           });
         } else {
-          this.$router.push(path);
+          // 通用打开：可重复时附加唯一标识生成独立标签页
+          this.$openView(path, route);
         }
       } catch (e) {
         console.error(e);

package/src/layout/components/TagsView/index.vue

@@ -5,7 +5,7 @@
       <router-link
         v-for="tag in visitedViews"
         ref="tag"
-        :key="tag.path"
+        :key="viewKey(tag)"
         :class="isActive(tag)?'active':''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
         tag="span"
@@ -61,6 +61,7 @@
 <script>
 import ScrollPane from './ScrollPane'
 import path from 'path'
+import { viewKey, isRepeatable } from '@base/utils/repeatOpen'
 
 export default {
   components: {ScrollPane},
@@ -120,10 +121,16 @@ export default {
       if (this.$t1) {
         title = this.$t1(title)
       }
+      if (item.repeatIndex > 1) {
+        title = `${title} (${item.repeatIndex})`
+      }
       return title;
     },
+    viewKey(view) {
+      return viewKey(view)
+    },
     isActive(route) {
-      return route.path === this.$route.path
+      return viewKey(route) === viewKey(this.$route)
     },
     isAffix(tag) {
       return tag.meta && tag.meta.affix
@@ -168,8 +175,12 @@ export default {
     moveToCurrentTag() {
       const tags = this.$refs.tag
       this.$nextTick(() => {
+        const routeIsRepeat = isRepeatable(this.$route)
         for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
+          const matched = routeIsRepeat
+            ? tag.to.fullPath === this.$route.fullPath
+            : tag.to.path === this.$route.path
+          if (matched) {
             this.$refs.scrollPane.moveToTarget(tag)
             // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {

package/src/views/user/form/view/list.vue

@@ -274,7 +274,6 @@ export default {
       });
     },
     openEditDialog(row, param, option) {
-      debugger;
       if (option?.otherTab) {
         this.openOtherTab(row, param, option);
         return;
@@ -334,7 +333,6 @@ export default {
       this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
     },
     openEditH5Dialog(row, param) {
-      debugger;
       this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
       this.param = param;