cloud-web-corejs 1.0.54-dev.194 → 1.0.54-dev.195

package/src/components/xform/form-designer/setting-panel/property-editor/field-button/search-dialog-event-editor.vue

@@ -4,7 +4,9 @@
       <el-divider class="custom-divider">选择弹框配置</el-divider>
     </el-form-item>
     <el-form-item label="是否多选">
-      <el-switch v-model="eventConfig.multipleChoices"></el-switch>
+      <el-switch v-model="eventConfig.multipleChoices"
+                 v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
+      <span v-else>{{eventConfig.multipleChoices?'是':'否'}}</span>
     </el-form-item>
     <el-form-item label="弹框表单编码">
       <el-input type="text" v-model="eventConfig.formCode"></el-input>
@@ -16,7 +18,7 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
-    <template v-if="selectedWidget.type == 'vabsearch'">
+    <template v-if="hasConfig('vabsearchFlag')">
       <el-form-item label="关联来源字段">
         <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
       </el-form-item>
@@ -28,7 +30,7 @@
     <!--      <el-form-item label="多选">
           <el-switch v-model="optionModel.multiple"></el-switch>
         </el-form-item>-->
-    <template v-if="selectedWidget.type != 'vabsearch'">
+    <template v-if="!hasConfig('vabsearchFlag')">
       <el-form-item label="关联表格">
         <el-switch v-model="eventConfig.tableEnabled"></el-switch>
       </el-form-item>
@@ -142,10 +144,10 @@
 import i18n from "../../../../../../components/xform/utils/i18n"
 import eventMixin
   from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
-
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
 
 export default {
-  mixins: [i18n, eventMixin],
+  mixins: [i18n, eventMixin, propertyMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -156,20 +158,20 @@ export default {
     return {
       showDialog: false,
       tableData: [],
-      option1:{
-        customCode:()=>{
+      option1: {
+        customCode: () => {
           return this.eventConfig.confirmCallback;
         },
-        callback:(code)=>{
+        callback: (code) => {
           this.eventConfig.confirmCallback = code;
           this.$forceUpdate()
         }
       },
-      option2:{
-        customCode:()=>{
+      option2: {
+        customCode: () => {
           return this.eventConfig.dialogQueryParam;
         },
-        callback:(code)=>{
+        callback: (code) => {
           this.eventConfig.dialogQueryParam = code;
           this.$forceUpdate()
         }

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabSearch/vabSearchName-editor.vue

@@ -1,7 +1,9 @@
 <template>
   <div>
     <el-form-item label="是否多选">
-      <el-switch v-model="optionModel.multipleChoices"></el-switch>
+      <el-switch v-model="optionModel.multipleChoices"
+                 v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
+      <span v-else>{{ optionModel.multipleChoices ? '是' : '否' }}</span>
     </el-form-item>
     <el-form-item label="关联字段" v-if="optionModel.multipleChoices">
       <el-input type="text" v-model="optionModel.valueField"></el-input>
@@ -10,11 +12,11 @@
       <el-input type="text" v-model="optionModel.vabSearchName"></el-input>
     </el-form-item>
     <template v-if="!optionModel.multipleChoices">
-      <el-form-item label="默认用户">
+      <el-form-item label="默认当前用户">
         <el-switch v-model="optionModel.userDefaultVabSearch"
                    @change="optionModel.saleOrgDefaultVabSearch=false"></el-switch>
       </el-form-item>
-      <el-form-item label="默认机构">
+      <el-form-item label="默认当前机构">
         <el-switch v-model="optionModel.saleOrgDefaultVabSearch"
                    @change="optionModel.userDefaultVabSearch=false"></el-switch>
       </el-form-item>

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

@@ -5,18 +5,18 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../components/xform/utils/i18n"
+import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
 
-  export default {
-    name: "multiple-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "multiple-editor",
+  mixins: [i18n, propertyMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+}
 </script>
 
 <style scoped>

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

@@ -3,9 +3,16 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">项目标签设置</el-divider>
     </el-form-item>
-    <el-form-item label="表单编码">
+    <el-form-item label="弹框表单编码">
       <el-input v-model="optionModel.tagFormCode" clearable></el-input>
     </el-form-item>
+    <el-form-item label="弹框查询参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('tagFormParam', ['dataId', 'formCode'])">
+        <span>{{ optionModel.tagFormParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
     <el-form-item label="展示字段">
       <el-input v-model="optionModel.tagLabelField" clearable></el-input>
     </el-form-item>
@@ -18,13 +25,7 @@
     <el-form-item label="来源唯一关键字段">
       <el-input v-model="optionModel.tagFormUniqueField" clearable></el-input>
     </el-form-item>
-    <el-form-item label="表单参数">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('tagFormParam', ['dataId', 'formCode'])">
-        <span>{{ optionModel.cf_vendor_item }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
+
     <el-form-item label="明细字段回填">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="openDialog">
@@ -33,7 +34,7 @@
       </a>
     </el-form-item>
     <el-form-item label="确认回调">
-<!--      <el-input v-model="optionModel.tagConfirmCallback" clearable></el-input>-->
+      <!--      <el-input v-model="optionModel.tagConfirmCallback" clearable></el-input>-->
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('tagConfirmCallback', ['dataId', 'formCode','rows'])">
         <span>{{ optionModel.tagConfirmCallback }}</span>
@@ -41,7 +42,7 @@
       </a>
     </el-form-item>
     <el-form-item label="删除回调">
-<!--      <el-input v-model="optionModel.tagDeleteCallback" clearable></el-input>-->
+      <!--      <el-input v-model="optionModel.tagDeleteCallback" clearable></el-input>-->
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('tagDeleteCallback', ['dataId', 'formCode'])">
         <span>{{ optionModel.tagDeleteCallback }}</span>
@@ -52,13 +53,13 @@
       <el-switch v-model="optionModel.tabDeleteEnabled" clearable></el-switch>
     </el-form-item>
 
-<!--    <el-form-item label="查询参数">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
-        <span>{{ optionModel.formScriptParam }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>-->
+    <!--    <el-form-item label="查询参数">
+          <a href="javascript:void(0);" class="a-link link-oneLind"
+             @click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
+            <span>{{ optionModel.formScriptParam }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>-->
     <el-dialog
       custom-class="dialog-style list-dialog"
       title="数据回填"

package/src/components/xform/form-designer/toolbar-panel/index.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="toolbar-container">
     <div class="left-toolbar">
-      <!--       <el-button type="text" :disabled="undoDisabled" :title="i18nt('designer.toolbar.undoHint')" @click="undoHistory"><svg-icon icon-class="undo" /></el-button>
-            <el-button type="text" :disabled="redoDisabled" :title="i18nt('designer.toolbar.redoHint')" @click="redoHistory"><svg-icon icon-class="redo" /></el-button>-->
+      <el-button type="text" :disabled="undoDisabled" :title="i18nt('designer.toolbar.undoHint')" @click="undoHistory">
+        <svg-icon icon-class="undo"/>
+      </el-button>
+      <el-button type="text" :disabled="redoDisabled" :title="i18nt('designer.toolbar.redoHint')" @click="redoHistory">
+        <svg-icon icon-class="redo"/>
+      </el-button>
       <el-button-group>
-        <el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
+<!--        <el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
           {{ i18nt('designer.toolbar.pcLayout') }}
-        </el-button>
+        </el-button>-->
         <!--         <el-button :type="layoutType === 'Pad' ? 'info' : ''" @click="changeLayoutType('Pad')">{{ i18nt('designer.toolbar.padLayout') }}</el-button>-->
         <!--        <el-button :type="layoutType === 'H5' ? 'info' : ''" @click="changeLayoutType('H5')" size="mini">
                   {{ i18nt('designer.toolbar.mobileLayout') }}

package/src/components/xform/form-designer/widget-panel/index.vue

@@ -66,7 +66,6 @@
             <!-- -->
 
 
-
           </el-collapse>
 
         </el-tab-pane>
@@ -114,19 +113,7 @@
               </draggable>
             </el-collapse-item>
 
-            <el-collapse-item name="5" :title="i18nt('业务组件')">
-              <draggable tag="ul" :list="businessFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
-                         :move="checkFieldMove"
-                         :clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
-                <li v-for="(fld, index) in businessFields" :key="index" class="field-widget-item"
-                    :title="fld.displayName"
-                    @dblclick="addFieldByDbClick(fld)">
-              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
-              <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
-              </span>
-                </li>
-              </draggable>
-            </el-collapse-item>
+
 
             <el-collapse-item v-if="!!metaFields.main.entityName" name="1" :title="metaFields.main.entityLabel">
               <draggable tag="ul" :list="metaFields.main.fieldList"
@@ -160,7 +147,24 @@
             </template>
           </el-collapse>
         </el-tab-pane>
-
+        <el-tab-pane name="businessLib">
+          <span slot="label"><i class="el-icon-set-up"></i> {{ i18nt('业务组件') }}</span>
+          <el-collapse v-model="businessActiveNames" class="widget-collapse">
+            <el-collapse-item name="0" :title="i18nt('业务组件')">
+              <draggable tag="ul" :list="businessFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
+                         :move="checkFieldMove"
+                         :clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
+                <li v-for="(fld, index) in businessFields" :key="index" class="field-widget-item"
+                    :title="fld.displayName"
+                    @dblclick="addFieldByDbClick(fld)">
+              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
+              </span>
+                </li>
+              </draggable>
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
         <!--       <el-tab-pane v-if="showFormTemplates" name="formLib" style="padding: 8px">
                 <span slot="label"><i class="el-icon-c-scale-to-original"></i> {{i18nt('designer.formLib')}}</span>
 

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

@@ -39,6 +39,9 @@ modules = {
       scrollerHeight: 0,
       activeNames: ['1', '2', '3', '4'],
       metadataActiveNames: ["0", "1", "2", "3", "4"],
+
+      businessActiveNames:["0"],
+
       containers: baseRefUtil.containers,
       commonContainers: [],
       basicFields: baseRefUtil.basicFields,