瀏覽代碼

同步部分明鉴代码

cfort 3 年之前
父節點
當前提交
aa702d1d45

+ 2 - 2
src/business/platform/bpmn/form/index.vue

@@ -555,7 +555,7 @@
                     return this.hasFormOpinion() && !flag ? flag : true
                 }
                 // 是否有表单意见
-                return this.hasFormOpinion() ? true : this.attributes.isHideOpinion || false
+                return this.hasFormOpinion() ? true : (this.attributes.isHideOpinion || false)
             },
             /**
              * 构建操作按钮
@@ -583,7 +583,7 @@
                     const button = toolbars[i]
                     const alias = button.alias
                     const code = button.code
-                    button.key = alias === 'custom' ? code || alias + i : alias
+                    button.key = alias === 'custom' ? (code || (alias + i)) : alias
                     if (!this.instanceId) {
                         buttons.push(button)
                     } else if (!filterType.includes(button.key)) {

+ 43 - 12
src/business/platform/cat/type/tree.vue

@@ -1,19 +1,50 @@
 <template>
     <div class="jbd-tree">
-        <ibps-tree :title="title" :width="width" :height="height" :data="treeData" :location="location"
-            :options="treeOptions" :contextmenus="hasContextmenu ? treeContextmenus : []" :position="position"
-            :hasPermission="hasPermission" @action-event="handleTreeAction" @node-click="handleNodeClick"
-            @expand-collapse="handleExpandCollapse" ref="treeIndex" />
+        <ibps-tree
+            :title="title"
+            :width="width"
+            :height="height"
+            :data="treeData"
+            :location="location"
+            :options="treeOptions"
+            :contextmenus="hasContextmenu ? treeContextmenus : []"
+            :position="position"
+            :hasPermission="hasPermission"
+            @action-event="handleTreeAction"
+            @node-click="handleNodeClick"
+            @expand-collapse="handleExpandCollapse"
+            ref="treeIndex"
+        />
         <!-- 分类编辑 -->
-        <type-edit :id="editId" :parent-data="typeData" :is-private="isPrivate" :category-key="categoryKey"
-            :visible="typeFormVisible" :title="editTitle" @callback="loadTreeData"
-            @close="(visible) => (typeFormVisible = visible)" />
-        <type-move :id="editId" :parent-data="typeData" :is-private="isPrivate" :category-key="categoryKey"
-            :data="treeData" :visible="moveFormVisible" :title="editTitle" @callback="loadTreeData"
-            @close="(visible) => (moveFormVisible = visible)" />
+        <type-edit
+            :id="editId"
+            :parent-data="typeData"
+            :is-private="isPrivate"
+            :category-key="categoryKey"
+            :visible="typeFormVisible"
+            :title="editTitle"
+            @callback="loadTreeData"
+            @close="visible => typeFormVisible = visible"
+        />
+        <type-move
+            :id="editId"
+            :parent-data="typeData"
+            :is-private="isPrivate"
+            :category-key="categoryKey"
+            :data="treeData"
+            :visible="moveFormVisible"
+            :title="editTitle"
+            @callback="loadTreeData"
+            @close="visible => moveFormVisible = visible"
+        />
         <!-- 分类排序 -->
-        <type-sort :id="editId" :visible="sortFormVisible" title="分类排序" @callback="loadTreeData"
-            @close="(visible) => (sortFormVisible = visible)" />
+        <type-sort
+            :id="editId"
+            :visible="sortFormVisible"
+            title="分类排序"
+            @callback="loadTreeData"
+            @close="visible => sortFormVisible = visible"
+        />
     </div>
 </template>
 

+ 4 - 0
src/business/platform/data/components/search-form/index.vue

@@ -167,6 +167,7 @@
           v-else-if="item.fieldType === 'selector'"
           style="width: 150px;"
           v-model="params[item.modelValue]"
+          :size="item.size ? item.size : 'mini'"
           :type="item.selectorType||'user'"
           :placeholder="item.placeholder"
           :multiple="false"
@@ -177,6 +178,8 @@
         <ibps-custom-dialog
           v-else-if="item.fieldType === 'customDialog'"
           v-model="params[item.modelValue]"
+          :size="item.size ? item.size : 'mini'"
+          :disabled="item.disabled"
           :template-key="item.field_options.dialog"
           style="width: 150px;"
           :multiple="false"
@@ -189,6 +192,7 @@
         <ibps-link-data
           v-else-if="item.fieldType==='linkdata'"
           v-model="params[item.modelValue]"
+          :size="item.size ? item.size : 'mini'"
           :template-key="item.field_options.linkdata"
           style="width: 150px;"
           :multiple="item.field_options.multiple === 'Y'"

+ 5 - 0
src/business/platform/data/templaterender/custom-dialog/index.vue

@@ -7,6 +7,7 @@
       :multiple="multiple"
       :disabled="disabled"
       :readonly="readonly"
+      :size="size"
       :readonly-text="readonlyText"
       @click="handleSelectorClick"
       @remove="handleSelectorRemove"
@@ -82,6 +83,10 @@ export default {
       type: Boolean,
       default: false
     },
+    size: {
+      type: String,
+      default: 'mini'
+    },
     readonly: { // 只读
       type: Boolean,
       default: false