cloud-web-corejs 1.0.54-dev.687 → 1.0.54-dev.689

package/src/components/xform/form-designer/setting-panel/property-editor/field-script-input/script-input-editor.vue

@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <el-form-item label="编辑器语言">
+      <el-select v-model="optionModel.editorMode">
+        <el-option value="javascript" label="JavaScript"></el-option>
+        <el-option value="java" label="Java"></el-option>
+        <el-option value="json" label="JSON"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="编辑器高度">
+      <el-input
+        v-model="optionModel.editorHeight"
+        placeholder="如 200px"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="最小行数">
+      <el-input-number
+        v-model="optionModel.editorMinLines"
+        :min="3"
+        :max="100"
+        controls-position="right"
+        style="width: 100%"
+      ></el-input-number>
+    </el-form-item>
+    <el-form-item label="最大行数">
+      <el-input-number
+        v-model="optionModel.editorMaxLines"
+        :min="3"
+        :max="200"
+        controls-position="right"
+        style="width: 100%"
+      ></el-input-number>
+    </el-form-item>
+    <el-form-item label="语法检查">
+      <el-switch v-model="optionModel.userWorker"></el-switch>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+
+export default {
+  name: "script-input-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -21,7 +21,9 @@
       </el-form-item>
       <el-form-item
         label="查询参数"
-        v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled"
+        v-if="
+          optionModel.formScriptEnabled || optionModel.commonAttributeEnabled
+        "
       >
         <a
           href="javascript:void(0);"
@@ -40,8 +42,14 @@
           @change="changeCommonAttributeEnabled"
         ></el-switch>
       </el-form-item>
-      <el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
-        <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
+      <el-form-item
+        :label="i18nt('词汇编码')"
+        v-if="optionModel.commonAttributeEnabled"
+      >
+        <el-input
+          type="text"
+          v-model="optionModel.commonAttributeCode"
+        ></el-input>
       </el-form-item>
       <!-- <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.labelKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
@@ -57,7 +65,9 @@
       <a
         href="javascript:void(0);"
         class="a-link link-oneLind"
-        @click="editEventHandler('formScriptSuccess', ['dataId', 'formCode', 'res'])"
+        @click="
+          editEventHandler('formScriptSuccess', ['dataId', 'formCode', 'res'])
+        "
       >
         <span>{{ optionModel.formScriptSuccess }}</span>
         <i class="el-icon-edit"></i>
@@ -87,6 +97,7 @@ export default {
         "census",
         "status",
         "gantt",
+        "cascader",
       ],
     };
   },

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

@@ -51,6 +51,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",
@@ -126,6 +127,7 @@ const COMMON_PROPERTIES = {
 
   oplogFlag: "oplogFlag-editor",
   vuePageFlag: "vue-page-editor",
+  scriptInputFlag: "script-input-editor",
   ganttConfig: "gantt-editor",
 
   //弹框

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

@@ -176,6 +176,8 @@ export const containers = [
       label: "data-table",
       submitFlag: true,
       formField: "",
+      required: !1,
+      requiredHint: "",
       hidden: !1,
       rowSpacing: 8,
       tableHeight: "",
@@ -257,7 +259,7 @@ export const containers = [
       dynamicColumnMode: "append",
       dynamicColumnScriptCode: null,
       dynamicColumnScriptParam: null,
-      onDynamicColumnsConvert: null,
+      dynamicSchemaConvert: null,
       dynamicColumnLoadScript: null,
       accessType: "1",
       accessUrl: null,
@@ -1121,6 +1123,59 @@ export const basicFields = [
       ...defaultTextFlagConfig,
     },
   },
+  {
+    type: "script-input",
+    icon: "textarea-field",
+    commonFlag: !0,
+    formItemFlag: !0,
+    columnFlag: true,
+    tableField: null,
+    options: {
+      name: "",
+      keyNameEnabled: !1,
+      keyName: "",
+      label: "",
+      labelColor: "",
+      submitFlag: true,
+      labelAlign: "",
+      defaultValue: "",
+      placeholder: "",
+      columnWidth: "200px",
+      size: "",
+      labelWidth: null,
+      labelHidden: !1,
+      readonly: !1,
+      disabled: !1,
+      hidden: !1,
+      required: !1,
+      requiredHint: "",
+      validation: "",
+      validationHint: "",
+      customClass: "",
+      labelIconClass: null,
+      labelIconPosition: "rear",
+      labelTooltip: null,
+      scriptInputFlag: 1,
+      editorMode: "java",
+      editorHeight: "200px",
+      editorMinLines: 8,
+      editorMaxLines: 30,
+      userWorker: !1,
+      onCreated: "",
+      onMounted: "",
+      onInput: "",
+      onChange: "",
+      onFocus: "",
+      onBlur: "",
+      onValidate: "",
+      accessType: "1",
+      ...defaultWfConfig,
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+      ...defaultTextFlagConfig,
+    },
+  },
   {
     type: "number",
     icon: "number-field",
@@ -2981,7 +3036,7 @@ export const advancedFields = [
     formItemFlag: !1,
     options: {
       name: "",
-      label: "重置",
+      label: "刷新",
       columnWidth: "200px",
       size: "",
       displayStyle: "block",
@@ -3611,6 +3666,66 @@ 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,
+      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,
+      //-------------------
+      onCreated: "",
+      onMounted: "",
+      onChange: "",
+      onFocus: "",
+      onBlur: "",
+      onValidate: "",
+    },
+  },
 ];
 
 export const businessFields = [