@ray-js/api 1.5.8 → 1.5.9

package/lib/cloud/interface.d.ts

@@ -1,3 +1,11 @@
+/**
+ * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
+ */
+type AssociativeEntityId = string;
+/**
+ * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
+ */
+type AssociativeEntityValue = string;
 export interface Scene {
     dpId: number;
     bindType: number;
@@ -869,7 +877,8 @@ export type IGetSceneListResponse = Array<{
 }>;
 export interface IBindRule {
     devId: string;
-    associativeEntityId: string;
+    sourceEntityId?: string;
+    associativeEntityId: AssociativeEntityId;
     ruleId: string;
     entitySubIds: string;
     expr: [string[]];
@@ -878,13 +887,13 @@ export interface IBindRule {
 }
 export interface IBindRuleResponse {
     /**
-     * 关联 DP 点和 DP 点值的组合
+     * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
      */
-    associativeEntityId: string;
+    associativeEntityId: AssociativeEntityId;
     /**
-     * 动作 ID
+     * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
      */
-    associativeEntityValue: string;
+    associativeEntityValue: AssociativeEntityValue;
     /**
      * 业务域
      */
@@ -910,16 +919,20 @@ export interface IBindRuleResponse {
      */
     triggerRuleVO: any;
 }
+declare enum EntityType {
+    DEVICE = 1,// 关联实体为设备
+    RULE = 2
+}
 export interface IGetBindRuleList {
     bizDomain: string;
     devId: string;
     sourceEntityId?: string;
-    entityType: number;
+    entityType: EntityType;
     gid: string;
 }
 export type IGetBindRuleListResponse = Array<{
-    associativeEntityId: string;
-    associativeEntityValueList: any[];
+    associativeEntityId: AssociativeEntityId;
+    associativeEntityValueList: AssociativeEntityValue[];
     bizDomain: string;
     sourceEntityId: string;
 }>;
@@ -927,8 +940,8 @@ export interface IRemoveRule {
     bizDomain: string;
     sourceEntityId?: string;
     devId: string;
-    associativeEntityId: string;
-    associativeEntityValue: string;
+    associativeEntityId: AssociativeEntityId;
+    associativeEntityValue: AssociativeEntityValue;
     gid: string;
 }
 export interface IGetDevProperty {
@@ -1059,3 +1072,4 @@ export type IGetZigbeeLocalGroupDeviceListResponse = Array<{
      */
     gwOnline: boolean;
 }>;
+export {};

package/lib/cloud/interface.js

@@ -1 +1,19 @@
+// 场景相关接口
+/**
+ * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
+ */
+/**
+ * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
+ */
+// 云端定时接口
+// 电费统计接口
+// 设备接口
+// 数据统计接口
+// 告警相关接口
+// 联动相关
+var EntityType = /*#__PURE__*/function (EntityType) {
+  EntityType[EntityType["DEVICE"] = 1] = "DEVICE";
+  EntityType[EntityType["RULE"] = 2] = "RULE";
+  return EntityType;
+}(EntityType || {}); // 关联实体为联动规则
 export {};

package/lib/cloud/linkage.d.ts

@@ -10,7 +10,7 @@ declare const getLinkageDeviceList: (params: IGetLinkageDeviceList) => Promise<I
  * @param {number} devId 设备id
  * @param {number} gid 家庭Id
  */
-declare const getSceneList: ({ devId, gid }: {
+declare const getSceneList: ({ devId, gid, }: {
     devId: string;
     gid: string;
 }) => Promise<IGetSceneListResponse>;
@@ -31,7 +31,7 @@ declare const getBindRuleList: (params: IGetBindRuleList) => Promise<IGetBindRul
  * @param {string} bizDomain 业务域
  * @param {string} bizDomain 业务域
  */
-declare const bindRule: ({ devId, associativeEntityId, ruleId, entitySubIds, expr, bizDomain, gid }: IBindRule) => Promise<IBindRuleResponse>;
+declare const bindRule: (params: IBindRule) => Promise<IBindRuleResponse>;
 /**
  * 解除联动
  * @param {string} bizDomain 业务范围

package/lib/cloud/linkage.js

@@ -1,6 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-const _excluded = ["gid", "devId", "sourceEntityId"];
+const _excluded = ["gid", "devId", "sourceEntityId"],
+  _excluded2 = ["sourceEntityId", "devId", "gid"];
 import { requestCloud } from '../';
 import { THING } from '../constants';
 /**
@@ -76,22 +77,23 @@ const getBindRuleList = async params => {
  * @param {string} bizDomain 业务域
  * @param {string} bizDomain 业务域
  */
-const bindRule = _ref2 => {
-  let {
+const bindRule = params => {
+  const {
     devId,
+    sourceEntityId,
     associativeEntityId,
     ruleId,
     entitySubIds,
     expr,
     bizDomain,
     gid
-  } = _ref2;
+  } = params;
   return requestCloud({
     api: "".concat(THING, ".m.linkage.associative.entity.bind"),
     version: '1.0',
     data: {
       relationExpr: {
-        sourceEntityId: devId,
+        sourceEntityId: sourceEntityId || devId,
         associativeEntityId,
         associativeEntityValue: ruleId,
         triggerRuleVO: {
@@ -127,12 +129,20 @@ const bindRule = _ref2 => {
  * @param {string} gid 家庭id
  */
 const removeRule = params => {
+  const {
+      sourceEntityId,
+      devId,
+      gid
+    } = params,
+    rest = _objectWithoutProperties(params, _excluded2);
   return requestCloud({
     api: "".concat(THING, ".m.linkage.associative.entity.remove"),
     version: '1.0',
-    data: _objectSpread({}, params),
+    data: _objectSpread({
+      sourceEntityId: sourceEntityId || devId
+    }, rest),
     extData: {
-      gid: "".concat(params.gid)
+      gid: "".concat(gid)
     }
   });
 };
@@ -141,10 +151,10 @@ const removeRule = params => {
  * 触发联动
  * @param {string} ruleId 规则id
  */
-const triggerRule = _ref3 => {
+const triggerRule = _ref2 => {
   let {
     ruleId
-  } = _ref3;
+  } = _ref2;
   return requestCloud({
     api: "".concat(THING, ".m.linkage.rule.trigger"),
     version: '1.0',
@@ -158,10 +168,10 @@ const triggerRule = _ref3 => {
  *  启用联动
  * @param {string} ruleId 规则id
  */
-const enableRule = _ref4 => {
+const enableRule = _ref3 => {
   let {
     ruleId
-  } = _ref4;
+  } = _ref3;
   return requestCloud({
     api: "".concat(THING, ".m.linkage.rule.enable"),
     version: '1.0',
@@ -175,10 +185,10 @@ const enableRule = _ref4 => {
  * 停用联动
  * @param {string} ruleId 规则id
  */
-const disableRule = _ref5 => {
+const disableRule = _ref4 => {
   let {
     ruleId
-  } = _ref5;
+  } = _ref4;
   return requestCloud({
     api: "".concat(THING, ".m.linkage.rule.disable"),
     version: '1.0',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.5.8",
-    "@ray-js/router": "1.5.8",
+    "@ray-js/framework": "1.5.9",
+    "@ray-js/router": "1.5.9",
     "@ray-js/wechat": "^0.2.9",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.5.8",
+    "@ray-js/cli": "1.5.9",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.2",
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "5e676b1fb2f9d04c5bcec74f0988dcb9c7e658b8"
+  "gitHead": "01395752c6cc7f4b152fcc6262b6ef2a502f0dd9"
 }