bug fixes

src/api/base.ts

@@ -45,12 +45,12 @@ export function updateUploadVideoAuth(data: { source_id: string }) {
 }
 
 // 获取实验下的所有用户属性
-export function getMetaUserAttrList() {
-  return httpRequest.get('/api/lab/v1/experiment/meta-member/all')
+export function getMetaUserAttrList(params?: { check_role?: boolean }) {
+  return httpRequest.get('/api/lab/v1/experiment/meta-member/all', { params })
 }
 // 获取实验下的所有事件
-export function getMetaEventList() {
-  return httpRequest.get('/api/lab/v1/experiment/meta-event/all')
+export function getMetaEventList(params?: { check_role?: boolean }) {
+  return httpRequest.get('/api/lab/v1/experiment/meta-event/all', { params })
 }
 
 // 获取实验下的所有标签
@@ -79,11 +79,17 @@ export function updateMaterial(data: { name: string; content: string; status: st
 }
 
 // 资料列表
-export function getMaterialList(params?: { name: string; type: string; id: string; status: string; updated_operator: string }) {
+export function getMaterialList(params?: {
+  name: string
+  type: string
+  id: string
+  status: string
+  updated_operator: string
+}) {
   return httpRequest.get('/api/lab/v1/experiment/marketing-material/list', { params })
 }
 
 // 删除资料
 export function deleteMaterial(data: { id: string }) {
   return httpRequest.post('/api/lab/v1/experiment/marketing-material/delete', data)
-}
\ No newline at end of file
+}

src/components/rule/EventRule.vue

@@ -125,7 +125,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
                 <el-option v-for="option in happenInfoList" :key="option.label" v-bind="option"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="rule.happen_info.is_happened">
+            <el-form-item>
               <el-select v-model="rule.happen_info.event_id" @change="value => handleEventChange(value, rule)">
                 <el-option
                   v-for="option in metaEventList"
@@ -134,110 +134,95 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
                   :value="option.id"></el-option>
               </el-select>
             </el-form-item>
-            <el-button
-              text
-              :icon="Plus"
-              @click="handleAttrAdd(rule.happen_info.attr_list)"
-              v-if="rule.happen_info.is_happened"
-              >添加条件</el-button
-            >
+            <el-button text :icon="Plus" @click="handleAttrAdd(rule.happen_info.attr_list)">添加条件</el-button>
             <el-button text :icon="CloseBold" @click="handleRemove(eventAttrRule.items, index)"></el-button>
           </el-row>
-          <template v-if="rule.happen_info.is_happened">
-            <!-- 属性条件 -->
-            <el-row
-              justify="space-between"
-              class="rule-item"
-              v-for="(attr, index) in rule.happen_info.attr_list"
-              :key="index">
-              <div>
-                <el-form-item>
-                  <el-select v-model="attr.attr_id" @change="value => handleAttrChange(value, attr, rule)">
-                    <el-option
-                      v-for="option in getEventAttrList(rule.happen_info.event_id)"
-                      :key="option.id"
-                      :label="option.name"
-                      :value="option.id"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item>
-                  <el-select v-model="attr.operate" @change="value => handleOperateChange(value, attr)">
-                    <el-option
-                      v-for="option in getOperatorList(attr.attr_type)"
-                      :key="option.value"
-                      :label="option.alias || option.label"
-                      :value="option.value"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="!['null', 'not null'].includes(attr.operate)">
-                  <!-- 数字区间 -->
-                  <template v-if="['2', '3'].includes(attr.attr_type) && attr.operate === 'range'">
-                    <el-input-number step-strictly :controls="false" :min="0" v-model="attr.value.start" />
-                    <el-input-number step-strictly :controls="false" :min="0" v-model="attr.value.end" />
-                  </template>
-                  <!-- 日期区间 -->
-                  <template v-else-if="attr.attr_type === '4' && attr.operate === 'range'">
-                    <el-date-picker v-model="attr.value.start" type="date" value-format="YYYY-MM-DD" />
-                    <el-date-picker v-model="attr.value.end" type="date" value-format="YYYY-MM-DD" />
-                  </template>
-                  <!-- 时间区间 -->
-                  <template v-else-if="attr.attr_type === '5' && attr.operate === 'range'">
-                    <el-date-picker
-                      v-model="attr.value.start"
-                      type="datetime"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      style="width: 180px" />
-                    <el-date-picker
-                      v-model="attr.value.end"
-                      type="datetime"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      style="width: 180px" />
-                  </template>
-                  <template
-                    v-else-if="attr.attr_type === '4' && (attr.operate === 'after' || attr.operate === 'before')">
-                    <el-date-picker v-model="attr.value" type="date" value-format="YYYY-MM-DD" />
-                  </template>
-                  <template
-                    v-else-if="attr.attr_type === '5' && (attr.operate === 'after' || attr.operate === 'before')">
-                    <el-date-picker
-                      v-model="attr.value"
-                      type="datetime"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      style="width: 180px" />
-                  </template>
-                  <template v-else>
-                    <el-input v-model="attr.value" />
-                  </template>
-                </el-form-item>
-              </div>
-              <el-button
-                text
-                :icon="CloseBold"
-                @click="handleAttrRemove(rule.happen_info.attr_list, index)"></el-button>
-            </el-row>
-            <!-- 触发 -->
-            <el-row style="margin-top: 10px">
+          <!-- 属性条件 -->
+          <el-row
+            justify="space-between"
+            class="rule-item"
+            v-for="(attr, index) in rule.happen_info.attr_list"
+            :key="index">
+            <div>
               <el-form-item>
-                <el-select model-value="触发次数">
-                  <el-option v-for="option in triggerInfoList" :key="option.value" v-bind="option"></el-option>
+                <el-select v-model="attr.attr_id" @change="value => handleAttrChange(value, attr, rule)">
+                  <el-option
+                    v-for="option in getEventAttrList(rule.happen_info.event_id)"
+                    :key="option.id"
+                    :label="option.name"
+                    :value="option.id"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-select
-                  v-model="rule.trigger_info.operate"
-                  @change="value => handleTriggerOperateChange(value, rule)">
+                <el-select v-model="attr.operate" @change="value => handleOperateChange(value, attr)">
                   <el-option
-                    v-for="option in numberOperatorList"
+                    v-for="option in getOperatorList(attr.attr_type)"
                     :key="option.value"
                     :label="option.alias || option.label"
-                    :value="option.value" />
+                    :value="option.value"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item>
-                <el-input v-model="rule.trigger_info.value" />
+              <el-form-item v-if="!['null', 'not null'].includes(attr.operate)">
+                <!-- 数字区间 -->
+                <template v-if="['2', '3'].includes(attr.attr_type) && attr.operate === 'range'">
+                  <el-input-number step-strictly :controls="false" :min="0" v-model="attr.value.start" />
+                  <el-input-number step-strictly :controls="false" :min="0" v-model="attr.value.end" />
+                </template>
+                <!-- 日期区间 -->
+                <template v-else-if="attr.attr_type === '4' && attr.operate === 'range'">
+                  <el-date-picker v-model="attr.value.start" type="date" value-format="YYYY-MM-DD" />
+                  <el-date-picker v-model="attr.value.end" type="date" value-format="YYYY-MM-DD" />
+                </template>
+                <!-- 时间区间 -->
+                <template v-else-if="attr.attr_type === '5' && attr.operate === 'range'">
+                  <el-date-picker
+                    v-model="attr.value.start"
+                    type="datetime"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    style="width: 180px" />
+                  <el-date-picker
+                    v-model="attr.value.end"
+                    type="datetime"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    style="width: 180px" />
+                </template>
+                <template v-else-if="attr.attr_type === '4' && (attr.operate === 'after' || attr.operate === 'before')">
+                  <el-date-picker v-model="attr.value" type="date" value-format="YYYY-MM-DD" />
+                </template>
+                <template v-else-if="attr.attr_type === '5' && (attr.operate === 'after' || attr.operate === 'before')">
+                  <el-date-picker
+                    v-model="attr.value"
+                    type="datetime"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    style="width: 180px" />
+                </template>
+                <template v-else>
+                  <el-input v-model="attr.value" />
+                </template>
               </el-form-item>
-            </el-row>
-          </template>
+            </div>
+            <el-button text :icon="CloseBold" @click="handleAttrRemove(rule.happen_info.attr_list, index)"></el-button>
+          </el-row>
+          <!-- 触发 -->
+          <el-row style="margin-top: 10px" v-if="rule.happen_info.is_happened">
+            <el-form-item>
+              <el-select model-value="触发次数">
+                <el-option v-for="option in triggerInfoList" :key="option.value" v-bind="option"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-select v-model="rule.trigger_info.operate" @change="value => handleTriggerOperateChange(value, rule)">
+                <el-option
+                  v-for="option in numberOperatorList"
+                  :key="option.value"
+                  :label="option.alias || option.label"
+                  :value="option.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-input v-model="rule.trigger_info.value" />
+            </el-form-item>
+          </el-row>
         </section>
       </div>
     </div>

src/composables/useAllData.ts

@@ -37,7 +37,7 @@ export interface ConnectionType {
 const userAttrList = ref<AttrType[]>([])
 export function useUserAttr() {
   function fetchUserAttrList() {
-    getMetaUserAttrList().then((res: any) => {
+    getMetaUserAttrList({ check_role: true }).then((res: any) => {
       userAttrList.value = res.data.items
     })
   }
@@ -51,7 +51,7 @@ export function useUserAttr() {
 const metaEventList = ref<MetaEventType[]>([])
 export function useMetaEvent() {
   function fetchMetaEventList() {
-    getMetaEventList().then((res: any) => {
+    getMetaEventList({ check_role: true }).then((res: any) => {
       metaEventList.value = res.data.items
     })
   }
@@ -75,7 +75,7 @@ export function useTag() {
   return { fetchTagList, tagList }
 }
 
-// 所有标签
+// 所有连接
 const connectionList = ref<ConnectionType[]>([])
 export function useConnection() {
   function fetchConnectionList() {